diff --git a/.htaccess b/.htaccess
old mode 100644
new mode 100755
index 095a0cc637..11ee1d59f8
--- a/.htaccess
+++ b/.htaccess
@@ -1,8 +1,8 @@
 ErrorDocument 403 /core/templates/403.php
 ErrorDocument 404 /core/templates/404.php
 <IfModule mod_php5.c>
-php_value upload_max_filesize 512M
-php_value post_max_size 512M
+php_value upload_max_filesize 513M
+php_value post_max_size 513M
 php_value memory_limit 512M
 <IfModule env_module>
   SetEnv htaccessWorking true
diff --git a/3rdparty/mediawiki/CSSMin.php b/3rdparty/mediawiki/CSSMin.php
new file mode 100644
index 0000000000..1ee2919140
--- /dev/null
+++ b/3rdparty/mediawiki/CSSMin.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ * Minification of CSS stylesheets.
+ *
+ * Copyright 2010 Wikimedia Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * 		http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ * OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * @file
+ * @version 0.1.1 -- 2010-09-11
+ * @author Trevor Parscal <tparscal@wikimedia.org>
+ * @copyright Copyright 2010 Wikimedia Foundation
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ */
+
+/**
+ * Transforms CSS data
+ *
+ * This class provides minification, URL remapping, URL extracting, and data-URL embedding.
+ */
+class CSSMin {
+
+	/* Constants */
+
+	/**
+	 * Maximum file size to still qualify for in-line embedding as a data-URI
+	 *
+	 * 24,576 is used because Internet Explorer has a 32,768 byte limit for data URIs,
+	 * which when base64 encoded will result in a 1/3 increase in size.
+	 */
+	const EMBED_SIZE_LIMIT = 24576;
+	const URL_REGEX = 'url\(\s*[\'"]?(?P<file>[^\?\)\'"]*)(?P<query>\??[^\)\'"]*)[\'"]?\s*\)';
+
+	/* Protected Static Members */
+
+	/** @var array List of common image files extensions and mime-types */
+	protected static $mimeTypes = array(
+		'gif' => 'image/gif',
+		'jpe' => 'image/jpeg',
+		'jpeg' => 'image/jpeg',
+		'jpg' => 'image/jpeg',
+		'png' => 'image/png',
+		'tif' => 'image/tiff',
+		'tiff' => 'image/tiff',
+		'xbm' => 'image/x-xbitmap',
+	);
+
+	/* Static Methods */
+
+	/**
+	 * Gets a list of local file paths which are referenced in a CSS style sheet
+	 *
+	 * @param $source string CSS data to remap
+	 * @param $path string File path where the source was read from (optional)
+	 * @return array List of local file references
+	 */
+	public static function getLocalFileReferences( $source, $path = null ) {
+		$files = array();
+		$rFlags = PREG_OFFSET_CAPTURE | PREG_SET_ORDER;
+		if ( preg_match_all( '/' . self::URL_REGEX . '/', $source, $matches, $rFlags ) ) {
+			foreach ( $matches as $match ) {
+				$file = ( isset( $path )
+					? rtrim( $path, '/' ) . '/'
+					: '' ) . "{$match['file'][0]}";
+
+				// Only proceed if we can access the file
+				if ( !is_null( $path ) && file_exists( $file ) ) {
+					$files[] = $file;
+				}
+			}
+		}
+		return $files;
+	}
+
+	/**
+	 * @param $file string
+	 * @return bool|string
+	 */
+	protected static function getMimeType( $file ) {
+		$realpath = realpath( $file );
+		// Try a couple of different ways to get the mime-type of a file, in order of
+		// preference
+		if (
+			$realpath
+			&& function_exists( 'finfo_file' )
+			&& function_exists( 'finfo_open' )
+			&& defined( 'FILEINFO_MIME_TYPE' )
+		) {
+			// As of PHP 5.3, this is how you get the mime-type of a file; it uses the Fileinfo
+			// PECL extension
+			return finfo_file( finfo_open( FILEINFO_MIME_TYPE ), $realpath );
+		} elseif ( function_exists( 'mime_content_type' ) ) {
+			// Before this was deprecated in PHP 5.3, this was how you got the mime-type of a file
+			return mime_content_type( $file );
+		} else {
+			// Worst-case scenario has happened, use the file extension to infer the mime-type
+			$ext = strtolower( pathinfo( $file, PATHINFO_EXTENSION ) );
+			if ( isset( self::$mimeTypes[$ext] ) ) {
+				return self::$mimeTypes[$ext];
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Remaps CSS URL paths and automatically embeds data URIs for URL rules
+	 * preceded by an /* @embed * / comment
+	 *
+	 * @param $source string CSS data to remap
+	 * @param $local string File path where the source was read from
+	 * @param $remote string URL path to the file
+	 * @param $embedData bool If false, never do any data URI embedding, even if / * @embed * / is found
+	 * @return string Remapped CSS data
+	 */
+	public static function remap( $source, $local, $remote, $embedData = true ) {
+		$pattern = '/((?P<embed>\s*\/\*\s*\@embed\s*\*\/)(?P<pre>[^\;\}]*))?' .
+			self::URL_REGEX . '(?P<post>[^;]*)[\;]?/';
+		$offset = 0;
+		while ( preg_match( $pattern, $source, $match, PREG_OFFSET_CAPTURE, $offset ) ) {
+			// Skip fully-qualified URLs and data URIs
+			$urlScheme = parse_url( $match['file'][0], PHP_URL_SCHEME );
+			if ( $urlScheme ) {
+				// Move the offset to the end of the match, leaving it alone
+				$offset = $match[0][1] + strlen( $match[0][0] );
+				continue;
+			}
+			// URLs with absolute paths like /w/index.php need to be expanded
+			// to absolute URLs but otherwise left alone
+			if ( $match['file'][0] !== '' && $match['file'][0][0] === '/' ) {
+				// Replace the file path with an expanded (possibly protocol-relative) URL
+				// ...but only if wfExpandUrl() is even available.
+				// This will not be the case if we're running outside of MW
+				$lengthIncrease = 0;
+				if ( function_exists( 'wfExpandUrl' ) ) {
+					$expanded = wfExpandUrl( $match['file'][0], PROTO_RELATIVE );
+					$origLength = strlen( $match['file'][0] );
+					$lengthIncrease = strlen( $expanded ) - $origLength;
+					$source = substr_replace( $source, $expanded,
+						$match['file'][1], $origLength
+					);
+				}
+				// Move the offset to the end of the match, leaving it alone
+				$offset = $match[0][1] + strlen( $match[0][0] ) + $lengthIncrease;
+				continue;
+			}
+			// Shortcuts
+			$embed = $match['embed'][0];
+			$pre = $match['pre'][0];
+			$post = $match['post'][0];
+			$query = $match['query'][0];
+			$url = "{$remote}/{$match['file'][0]}";
+			$file = "{$local}/{$match['file'][0]}";
+			// bug 27052 - Guard against double slashes, because foo//../bar
+			// apparently resolves to foo/bar on (some?) clients
+			$url = preg_replace( '#([^:])//+#', '\1/', $url );
+			$replacement = false;
+			if ( $local !== false && file_exists( $file ) ) {
+				// Add version parameter as a time-stamp in ISO 8601 format,
+				// using Z for the timezone, meaning GMT
+				$url .= '?' . gmdate( 'Y-m-d\TH:i:s\Z', round( filemtime( $file ), -2 ) );
+				// Embedding requires a bit of extra processing, so let's skip that if we can
+				if ( $embedData && $embed ) {
+					$type = self::getMimeType( $file );
+					// Detect when URLs were preceeded with embed tags, and also verify file size is
+					// below the limit
+			var_dump($match['embed'], $file, filesize($file));
+					if (
+						$type
+						&& $match['embed'][1] > 0
+						&& filesize( $file ) < self::EMBED_SIZE_LIMIT
+					) {
+						// Strip off any trailing = symbols (makes browsers freak out)
+						$data = base64_encode( file_get_contents( $file ) );
+						// Build 2 CSS properties; one which uses a base64 encoded data URI in place
+						// of the @embed comment to try and retain line-number integrity, and the
+						// other with a remapped an versioned URL and an Internet Explorer hack
+						// making it ignored in all browsers that support data URIs
+						$replacement = "{$pre}url(data:{$type};base64,{$data}){$post};";
+						$replacement .= "{$pre}url({$url}){$post}!ie;";
+					}
+				}
+				if ( $replacement === false ) {
+					// Assume that all paths are relative to $remote, and make them absolute
+					$replacement = "{$embed}{$pre}url({$url}){$post};";
+				}
+			} elseif ( $local === false ) {
+				// Assume that all paths are relative to $remote, and make them absolute
+				$replacement = "{$embed}{$pre}url({$url}{$query}){$post};";
+			}
+			if ( $replacement !== false ) {
+				// Perform replacement on the source
+				$source = substr_replace(
+					$source, $replacement, $match[0][1], strlen( $match[0][0] )
+				);
+				// Move the offset to the end of the replacement in the source
+				$offset = $match[0][1] + strlen( $replacement );
+				continue;
+			}
+			// Move the offset to the end of the match, leaving it alone
+			$offset = $match[0][1] + strlen( $match[0][0] );
+		}
+		return $source;
+	}
+
+	/**
+	 * Removes whitespace from CSS data
+	 *
+	 * @param $css string CSS data to minify
+	 * @return string Minified CSS data
+	 */
+	public static function minify( $css ) {
+		return trim(
+			str_replace(
+				array( '; ', ': ', ' {', '{ ', ', ', '} ', ';}' ),
+				array( ';', ':', '{', '{', ',', '}', '}' ),
+				preg_replace( array( '/\s+/', '/\/\*.*?\*\//s' ), array( ' ', '' ), $css )
+			)
+		);
+	}
+}
diff --git a/3rdparty/mediawiki/JavaScriptMinifier.php b/3rdparty/mediawiki/JavaScriptMinifier.php
new file mode 100644
index 0000000000..db5326c7cf
--- /dev/null
+++ b/3rdparty/mediawiki/JavaScriptMinifier.php
@@ -0,0 +1,606 @@
+<?php
+/**
+ * JavaScript Minifier
+ *
+ * @file
+ * @author Paul Copperman <paul.copperman@gmail.com>
+ * @license Choose any of Apache, MIT, GPL, LGPL
+ */
+
+/**
+ * This class is meant to safely minify javascript code, while leaving syntactically correct
+ * programs intact. Other libraries, such as JSMin require a certain coding style to work
+ * correctly. OTOH, libraries like jsminplus, that do parse the code correctly are rather
+ * slow, because they construct a complete parse tree before outputting the code minified.
+ * So this class is meant to allow arbitrary (but syntactically correct) input, while being
+ * fast enough to be used for on-the-fly minifying.
+ */
+class JavaScriptMinifier {
+
+	/* Class constants */
+	/* Parsing states.
+	 * The state machine is only necessary to decide whether to parse a slash as division
+	 * operator or as regexp literal.
+	 * States are named after the next expected item. We only distinguish states when the
+	 * distinction is relevant for our purpose.
+	 */
+	const STATEMENT                = 0;
+	const CONDITION                = 1;
+	const PROPERTY_ASSIGNMENT      = 2;
+	const EXPRESSION               = 3;
+	const EXPRESSION_NO_NL         = 4; // only relevant for semicolon insertion
+	const EXPRESSION_OP            = 5;
+	const EXPRESSION_FUNC          = 6;
+	const EXPRESSION_TERNARY       = 7; // used to determine the role of a colon
+	const EXPRESSION_TERNARY_OP    = 8;
+	const EXPRESSION_TERNARY_FUNC  = 9;
+	const PAREN_EXPRESSION         = 10; // expression which is not on the top level
+	const PAREN_EXPRESSION_OP      = 11;
+	const PAREN_EXPRESSION_FUNC    = 12;
+	const PROPERTY_EXPRESSION      = 13; // expression which is within an object literal
+	const PROPERTY_EXPRESSION_OP   = 14;
+	const PROPERTY_EXPRESSION_FUNC = 15;
+
+	/* Token types */
+	const TYPE_UN_OP       = 1; // unary operators
+	const TYPE_INCR_OP     = 2; // ++ and --
+	const TYPE_BIN_OP      = 3; // binary operators
+	const TYPE_ADD_OP      = 4; // + and - which can be either unary or binary ops
+	const TYPE_HOOK        = 5; // ?
+	const TYPE_COLON       = 6; // :
+	const TYPE_COMMA       = 7; // ,
+	const TYPE_SEMICOLON   = 8; // ;
+	const TYPE_BRACE_OPEN  = 9; // {
+	const TYPE_BRACE_CLOSE = 10; // }
+	const TYPE_PAREN_OPEN  = 11; // ( and [
+	const TYPE_PAREN_CLOSE = 12; // ) and ]
+	const TYPE_RETURN      = 13; // keywords: break, continue, return, throw
+	const TYPE_IF          = 14; // keywords: catch, for, with, switch, while, if
+	const TYPE_DO          = 15; // keywords: case, var, finally, else, do, try
+	const TYPE_FUNC        = 16; // keywords: function
+	const TYPE_LITERAL     = 17; // all literals, identifiers and unrecognised tokens
+
+	// Sanity limit to avoid excessive memory usage
+	const STACK_LIMIT = 1000;
+
+	/* Static functions */
+
+	/**
+	 * Returns minified JavaScript code.
+	 *
+	 * NOTE: $maxLineLength isn't a strict maximum. Longer lines will be produced when
+	 *       literals (e.g. quoted strings) longer than $maxLineLength are encountered
+	 *       or when required to guard against semicolon insertion.
+	 *
+	 * @param $s String JavaScript code to minify
+	 * @param $statementsOnOwnLine Bool Whether to put each statement on its own line
+	 * @param $maxLineLength Int Maximum length of a single line, or -1 for no maximum.
+	 * @return String Minified code
+	 */
+	public static function minify( $s, $statementsOnOwnLine = false, $maxLineLength = 1000 ) {
+		// First we declare a few tables that contain our parsing rules
+
+		// $opChars : characters, which can be combined without whitespace in between them
+		$opChars = array(
+			'!' => true,
+			'"' => true,
+			'%' => true,
+			'&' => true,
+			"'" => true,
+			'(' => true,
+			')' => true,
+			'*' => true,
+			'+' => true,
+			',' => true,
+			'-' => true,
+			'.' => true,
+			'/' => true,
+			':' => true,
+			';' => true,
+			'<' => true,
+			'=' => true,
+			'>' => true,
+			'?' => true,
+			'[' => true,
+			']' => true,
+			'^' => true,
+			'{' => true,
+			'|' => true,
+			'}' => true,
+			'~' => true
+		);
+
+		// $tokenTypes : maps keywords and operators to their corresponding token type
+		$tokenTypes = array(
+			'!'          => self::TYPE_UN_OP,
+			'~'          => self::TYPE_UN_OP,
+			'delete'     => self::TYPE_UN_OP,
+			'new'        => self::TYPE_UN_OP,
+			'typeof'     => self::TYPE_UN_OP,
+			'void'       => self::TYPE_UN_OP,
+			'++'         => self::TYPE_INCR_OP,
+			'--'         => self::TYPE_INCR_OP,
+			'!='         => self::TYPE_BIN_OP,
+			'!=='        => self::TYPE_BIN_OP,
+			'%'          => self::TYPE_BIN_OP,
+			'%='         => self::TYPE_BIN_OP,
+			'&'          => self::TYPE_BIN_OP,
+			'&&'         => self::TYPE_BIN_OP,
+			'&='         => self::TYPE_BIN_OP,
+			'*'          => self::TYPE_BIN_OP,
+			'*='         => self::TYPE_BIN_OP,
+			'+='         => self::TYPE_BIN_OP,
+			'-='         => self::TYPE_BIN_OP,
+			'.'          => self::TYPE_BIN_OP,
+			'/'          => self::TYPE_BIN_OP,
+			'/='         => self::TYPE_BIN_OP,
+			'<'          => self::TYPE_BIN_OP,
+			'<<'         => self::TYPE_BIN_OP,
+			'<<='        => self::TYPE_BIN_OP,
+			'<='         => self::TYPE_BIN_OP,
+			'='          => self::TYPE_BIN_OP,
+			'=='         => self::TYPE_BIN_OP,
+			'==='        => self::TYPE_BIN_OP,
+			'>'          => self::TYPE_BIN_OP,
+			'>='         => self::TYPE_BIN_OP,
+			'>>'         => self::TYPE_BIN_OP,
+			'>>='        => self::TYPE_BIN_OP,
+			'>>>'        => self::TYPE_BIN_OP,
+			'>>>='       => self::TYPE_BIN_OP,
+			'^'          => self::TYPE_BIN_OP,
+			'^='         => self::TYPE_BIN_OP,
+			'|'          => self::TYPE_BIN_OP,
+			'|='         => self::TYPE_BIN_OP,
+			'||'         => self::TYPE_BIN_OP,
+			'in'         => self::TYPE_BIN_OP,
+			'instanceof' => self::TYPE_BIN_OP,
+			'+'          => self::TYPE_ADD_OP,
+			'-'          => self::TYPE_ADD_OP,
+			'?'          => self::TYPE_HOOK,
+			':'          => self::TYPE_COLON,
+			','          => self::TYPE_COMMA,
+			';'          => self::TYPE_SEMICOLON,
+			'{'          => self::TYPE_BRACE_OPEN,
+			'}'          => self::TYPE_BRACE_CLOSE,
+			'('          => self::TYPE_PAREN_OPEN,
+			'['          => self::TYPE_PAREN_OPEN,
+			')'          => self::TYPE_PAREN_CLOSE,
+			']'          => self::TYPE_PAREN_CLOSE,
+			'break'      => self::TYPE_RETURN,
+			'continue'   => self::TYPE_RETURN,
+			'return'     => self::TYPE_RETURN,
+			'throw'      => self::TYPE_RETURN,
+			'catch'      => self::TYPE_IF,
+			'for'        => self::TYPE_IF,
+			'if'         => self::TYPE_IF,
+			'switch'     => self::TYPE_IF,
+			'while'      => self::TYPE_IF,
+			'with'       => self::TYPE_IF,
+			'case'       => self::TYPE_DO,
+			'do'         => self::TYPE_DO,
+			'else'       => self::TYPE_DO,
+			'finally'    => self::TYPE_DO,
+			'try'        => self::TYPE_DO,
+			'var'        => self::TYPE_DO,
+			'function'   => self::TYPE_FUNC
+		);
+
+		// $goto : This is the main table for our state machine. For every state/token pair
+		//         the following state is defined. When no rule exists for a given pair,
+		//         the state is left unchanged.
+		$goto = array(
+			self::STATEMENT => array(
+				self::TYPE_UN_OP      => self::EXPRESSION,
+				self::TYPE_INCR_OP    => self::EXPRESSION,
+				self::TYPE_ADD_OP     => self::EXPRESSION,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
+				self::TYPE_RETURN     => self::EXPRESSION_NO_NL,
+				self::TYPE_IF         => self::CONDITION,
+				self::TYPE_FUNC       => self::CONDITION,
+				self::TYPE_LITERAL    => self::EXPRESSION_OP
+			),
+			self::CONDITION => array(
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
+			),
+			self::PROPERTY_ASSIGNMENT => array(
+				self::TYPE_COLON      => self::PROPERTY_EXPRESSION,
+				self::TYPE_BRACE_OPEN => self::STATEMENT
+			),
+			self::EXPRESSION => array(
+				self::TYPE_SEMICOLON  => self::STATEMENT,
+				self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
+				self::TYPE_FUNC       => self::EXPRESSION_FUNC,
+				self::TYPE_LITERAL    => self::EXPRESSION_OP
+			),
+			self::EXPRESSION_NO_NL => array(
+				self::TYPE_SEMICOLON  => self::STATEMENT,
+				self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
+				self::TYPE_FUNC       => self::EXPRESSION_FUNC,
+				self::TYPE_LITERAL    => self::EXPRESSION_OP
+			),
+			self::EXPRESSION_OP => array(
+				self::TYPE_BIN_OP     => self::EXPRESSION,
+				self::TYPE_ADD_OP     => self::EXPRESSION,
+				self::TYPE_HOOK       => self::EXPRESSION_TERNARY,
+				self::TYPE_COLON      => self::STATEMENT,
+				self::TYPE_COMMA      => self::EXPRESSION,
+				self::TYPE_SEMICOLON  => self::STATEMENT,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
+			),
+			self::EXPRESSION_FUNC => array(
+				self::TYPE_BRACE_OPEN => self::STATEMENT
+			),
+			self::EXPRESSION_TERNARY => array(
+				self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
+				self::TYPE_FUNC       => self::EXPRESSION_TERNARY_FUNC,
+				self::TYPE_LITERAL    => self::EXPRESSION_TERNARY_OP
+			),
+			self::EXPRESSION_TERNARY_OP => array(
+				self::TYPE_BIN_OP     => self::EXPRESSION_TERNARY,
+				self::TYPE_ADD_OP     => self::EXPRESSION_TERNARY,
+				self::TYPE_HOOK       => self::EXPRESSION_TERNARY,
+				self::TYPE_COMMA      => self::EXPRESSION_TERNARY,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
+			),
+			self::EXPRESSION_TERNARY_FUNC => array(
+				self::TYPE_BRACE_OPEN => self::STATEMENT
+			),
+			self::PAREN_EXPRESSION => array(
+				self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
+				self::TYPE_FUNC       => self::PAREN_EXPRESSION_FUNC,
+				self::TYPE_LITERAL    => self::PAREN_EXPRESSION_OP
+			),
+			self::PAREN_EXPRESSION_OP => array(
+				self::TYPE_BIN_OP     => self::PAREN_EXPRESSION,
+				self::TYPE_ADD_OP     => self::PAREN_EXPRESSION,
+				self::TYPE_HOOK       => self::PAREN_EXPRESSION,
+				self::TYPE_COLON      => self::PAREN_EXPRESSION,
+				self::TYPE_COMMA      => self::PAREN_EXPRESSION,
+				self::TYPE_SEMICOLON  => self::PAREN_EXPRESSION,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
+			),
+			self::PAREN_EXPRESSION_FUNC => array(
+				self::TYPE_BRACE_OPEN => self::STATEMENT
+			),
+			self::PROPERTY_EXPRESSION => array(
+				self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
+				self::TYPE_FUNC       => self::PROPERTY_EXPRESSION_FUNC,
+				self::TYPE_LITERAL    => self::PROPERTY_EXPRESSION_OP
+			),
+			self::PROPERTY_EXPRESSION_OP => array(
+				self::TYPE_BIN_OP     => self::PROPERTY_EXPRESSION,
+				self::TYPE_ADD_OP     => self::PROPERTY_EXPRESSION,
+				self::TYPE_HOOK       => self::PROPERTY_EXPRESSION,
+				self::TYPE_COMMA      => self::PROPERTY_ASSIGNMENT,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
+			),
+			self::PROPERTY_EXPRESSION_FUNC => array(
+				self::TYPE_BRACE_OPEN => self::STATEMENT
+			)
+		);
+
+		// $push : This table contains the rules for when to push a state onto the stack.
+		//         The pushed state is the state to return to when the corresponding
+		//         closing token is found
+		$push = array(
+			self::STATEMENT => array(
+				self::TYPE_BRACE_OPEN => self::STATEMENT,
+				self::TYPE_PAREN_OPEN => self::EXPRESSION_OP
+			),
+			self::CONDITION => array(
+				self::TYPE_PAREN_OPEN => self::STATEMENT
+			),
+			self::PROPERTY_ASSIGNMENT => array(
+				self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT
+			),
+			self::EXPRESSION => array(
+				self::TYPE_BRACE_OPEN => self::EXPRESSION_OP,
+				self::TYPE_PAREN_OPEN => self::EXPRESSION_OP
+			),
+			self::EXPRESSION_NO_NL => array(
+				self::TYPE_BRACE_OPEN => self::EXPRESSION_OP,
+				self::TYPE_PAREN_OPEN => self::EXPRESSION_OP
+			),
+			self::EXPRESSION_OP => array(
+				self::TYPE_HOOK       => self::EXPRESSION,
+				self::TYPE_PAREN_OPEN => self::EXPRESSION_OP
+			),
+			self::EXPRESSION_FUNC => array(
+				self::TYPE_BRACE_OPEN => self::EXPRESSION_OP
+			),
+			self::EXPRESSION_TERNARY => array(
+				self::TYPE_BRACE_OPEN => self::EXPRESSION_TERNARY_OP,
+				self::TYPE_PAREN_OPEN => self::EXPRESSION_TERNARY_OP
+			),
+			self::EXPRESSION_TERNARY_OP => array(
+				self::TYPE_HOOK       => self::EXPRESSION_TERNARY,
+				self::TYPE_PAREN_OPEN => self::EXPRESSION_TERNARY_OP
+			),
+			self::EXPRESSION_TERNARY_FUNC => array(
+				self::TYPE_BRACE_OPEN => self::EXPRESSION_TERNARY_OP
+			),
+			self::PAREN_EXPRESSION => array(
+				self::TYPE_BRACE_OPEN => self::PAREN_EXPRESSION_OP,
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION_OP
+			),
+			self::PAREN_EXPRESSION_OP => array(
+				self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION_OP
+			),
+			self::PAREN_EXPRESSION_FUNC => array(
+				self::TYPE_BRACE_OPEN => self::PAREN_EXPRESSION_OP
+			),
+			self::PROPERTY_EXPRESSION => array(
+				self::TYPE_BRACE_OPEN => self::PROPERTY_EXPRESSION_OP,
+				self::TYPE_PAREN_OPEN => self::PROPERTY_EXPRESSION_OP
+			),
+			self::PROPERTY_EXPRESSION_OP => array(
+				self::TYPE_PAREN_OPEN => self::PROPERTY_EXPRESSION_OP
+			),
+			self::PROPERTY_EXPRESSION_FUNC => array(
+				self::TYPE_BRACE_OPEN => self::PROPERTY_EXPRESSION_OP
+			)
+		);
+
+		// $pop : Rules for when to pop a state from the stack
+		$pop = array(
+			self::STATEMENT              => array( self::TYPE_BRACE_CLOSE => true ),
+			self::PROPERTY_ASSIGNMENT    => array( self::TYPE_BRACE_CLOSE => true ),
+			self::EXPRESSION             => array( self::TYPE_BRACE_CLOSE => true ),
+			self::EXPRESSION_NO_NL       => array( self::TYPE_BRACE_CLOSE => true ),
+			self::EXPRESSION_OP          => array( self::TYPE_BRACE_CLOSE => true ),
+			self::EXPRESSION_TERNARY_OP  => array( self::TYPE_COLON       => true ),
+			self::PAREN_EXPRESSION       => array( self::TYPE_PAREN_CLOSE => true ),
+			self::PAREN_EXPRESSION_OP    => array( self::TYPE_PAREN_CLOSE => true ),
+			self::PROPERTY_EXPRESSION    => array( self::TYPE_BRACE_CLOSE => true ),
+			self::PROPERTY_EXPRESSION_OP => array( self::TYPE_BRACE_CLOSE => true )
+		);
+
+		// $semicolon : Rules for when a semicolon insertion is appropriate
+		$semicolon = array(
+			self::EXPRESSION_NO_NL => array(
+				self::TYPE_UN_OP      => true,
+				self::TYPE_INCR_OP    => true,
+				self::TYPE_ADD_OP     => true,
+				self::TYPE_BRACE_OPEN => true,
+				self::TYPE_PAREN_OPEN => true,
+				self::TYPE_RETURN     => true,
+				self::TYPE_IF         => true,
+				self::TYPE_DO         => true,
+				self::TYPE_FUNC       => true,
+				self::TYPE_LITERAL    => true
+			),
+			self::EXPRESSION_OP => array(
+				self::TYPE_UN_OP      => true,
+				self::TYPE_INCR_OP    => true,
+				self::TYPE_BRACE_OPEN => true,
+				self::TYPE_RETURN     => true,
+				self::TYPE_IF         => true,
+				self::TYPE_DO         => true,
+				self::TYPE_FUNC       => true,
+				self::TYPE_LITERAL    => true
+			)
+		);
+
+		// Rules for when newlines should be inserted if
+		// $statementsOnOwnLine is enabled.
+		// $newlineBefore is checked before switching state,
+		// $newlineAfter is checked after
+		$newlineBefore = array(
+			self::STATEMENT => array(
+				self::TYPE_BRACE_CLOSE => true,
+			),
+		);
+		$newlineAfter = array(
+			self::STATEMENT => array(
+				self::TYPE_BRACE_OPEN => true,
+				self::TYPE_PAREN_CLOSE => true,
+				self::TYPE_SEMICOLON => true,
+			),
+		);
+
+		// $divStates : Contains all states that can be followed by a division operator
+		$divStates = array(
+			self::EXPRESSION_OP          => true,
+			self::EXPRESSION_TERNARY_OP  => true,
+			self::PAREN_EXPRESSION_OP    => true,
+			self::PROPERTY_EXPRESSION_OP => true
+		);
+
+		// Here's where the minifying takes place: Loop through the input, looking for tokens
+		// and output them to $out, taking actions to the above defined rules when appropriate.
+		$out = '';
+		$pos = 0;
+		$length = strlen( $s );
+		$lineLength = 0;
+		$newlineFound = true;
+		$state = self::STATEMENT;
+		$stack = array();
+		$last = ';'; // Pretend that we have seen a semicolon yet
+		while( $pos < $length ) {
+			// First, skip over any whitespace and multiline comments, recording whether we
+			// found any newline character
+			$skip = strspn( $s, " \t\n\r\xb\xc", $pos );
+			if( !$skip ) {
+				$ch = $s[$pos];
+				if( $ch === '/' && substr( $s, $pos, 2 ) === '/*' ) {
+					// Multiline comment. Search for the end token or EOT.
+					$end = strpos( $s, '*/', $pos + 2 );
+					$skip = $end === false ? $length - $pos : $end - $pos + 2;
+				}
+			}
+			if( $skip ) {
+				// The semicolon insertion mechanism needs to know whether there was a newline
+				// between two tokens, so record it now.
+				if( !$newlineFound && strcspn( $s, "\r\n", $pos, $skip ) !== $skip ) {
+					$newlineFound = true;
+				}
+				$pos += $skip;
+				continue;
+			}
+			// Handle C++-style comments and html comments, which are treated as single line
+			// comments by the browser, regardless of whether the end tag is on the same line.
+			// Handle --> the same way, but only if it's at the beginning of the line
+			if( ( $ch === '/' && substr( $s, $pos, 2 ) === '//' )
+				|| ( $ch === '<' && substr( $s, $pos, 4 ) === '<!--' )
+				|| ( $ch === '-' && $newlineFound && substr( $s, $pos, 3 ) === '-->' )
+			) {
+				$pos += strcspn( $s, "\r\n", $pos );
+				continue;
+			}
+
+			// Find out which kind of token we're handling. $end will point past the end of it.
+			$end = $pos + 1;
+			// Handle string literals
+			if( $ch === "'" || $ch === '"' ) {
+				// Search to the end of the string literal, skipping over backslash escapes
+				$search = $ch . '\\';
+				do{
+					$end += strcspn( $s, $search, $end ) + 2;
+				} while( $end - 2 < $length && $s[$end - 2] === '\\' );
+				$end--;
+			// We have to distinguish between regexp literals and division operators
+			// A division operator is only possible in certain states
+			} elseif( $ch === '/' && !isset( $divStates[$state] ) ) {
+				// Regexp literal, search to the end, skipping over backslash escapes and
+				// character classes
+				for( ; ; ) {
+					do{
+						$end += strcspn( $s, '/[\\', $end ) + 2;
+					} while( $end - 2 < $length && $s[$end - 2] === '\\' );
+					$end--;
+					if( $end - 1 >= $length || $s[$end - 1] === '/' ) {
+						break;
+					}
+					do{
+						$end += strcspn( $s, ']\\', $end ) + 2;
+					} while( $end - 2 < $length && $s[$end - 2] === '\\' );
+					$end--;
+				};
+				// Search past the regexp modifiers (gi)
+				while( $end < $length && ctype_alpha( $s[$end] ) ) {
+					$end++;
+				}
+			} elseif(
+				$ch === '0'
+				&& ($pos + 1 < $length) && ($s[$pos + 1] === 'x' || $s[$pos + 1] === 'X' )
+			) {
+				// Hex numeric literal
+				$end++; // x or X
+				$len = strspn( $s, '0123456789ABCDEFabcdef', $end );
+				if ( !$len ) {
+					return self::parseError($s, $pos, 'Expected a hexadecimal number but found ' . substr( $s, $pos, 5 ) . '...' );
+				}
+				$end += $len;
+			} elseif(
+				ctype_digit( $ch )
+				|| ( $ch === '.' && $pos + 1 < $length && ctype_digit( $s[$pos + 1] ) )
+			) {
+				$end += strspn( $s, '0123456789', $end );
+				$decimal = strspn( $s, '.', $end );
+				if ($decimal) {
+					if ( $decimal > 2 ) {
+						return self::parseError($s, $end, 'The number has too many decimal points' );
+					}
+					$end += strspn( $s, '0123456789', $end + 1 ) + $decimal;
+				}
+				$exponent = strspn( $s, 'eE', $end );
+				if( $exponent ) {
+					if ( $exponent > 1 ) {
+						return self::parseError($s, $end, 'Number with several E' );
+					}
+					$end++;
+
+					// + sign is optional; - sign is required.
+					$end += strspn( $s, '-+', $end );
+					$len = strspn( $s, '0123456789', $end );
+					if ( !$len ) {
+						return self::parseError($s, $pos, 'No decimal digits after e, how many zeroes should be added?' );
+					}
+					$end += $len;
+				}
+			} elseif( isset( $opChars[$ch] ) ) {
+				// Punctuation character. Search for the longest matching operator.
+				while(
+					$end < $length
+					&& isset( $tokenTypes[substr( $s, $pos, $end - $pos + 1 )] )
+				) {
+					$end++;
+				}
+			} else {
+				// Identifier or reserved word. Search for the end by excluding whitespace and
+				// punctuation.
+				$end += strcspn( $s, " \t\n.;,=<>+-{}()[]?:*/%'\"!&|^~\xb\xc\r", $end );
+			}
+
+			// Now get the token type from our type array
+			$token = substr( $s, $pos, $end - $pos ); // so $end - $pos == strlen( $token )
+			$type = isset( $tokenTypes[$token] ) ? $tokenTypes[$token] : self::TYPE_LITERAL;
+
+			if( $newlineFound && isset( $semicolon[$state][$type] ) ) {
+				// This token triggers the semicolon insertion mechanism of javascript. While we
+				// could add the ; token here ourselves, keeping the newline has a few advantages.
+				$out .= "\n";
+				$state = self::STATEMENT;
+				$lineLength = 0;
+			} elseif( $maxLineLength > 0 && $lineLength + $end - $pos > $maxLineLength &&
+					!isset( $semicolon[$state][$type] ) && $type !== self::TYPE_INCR_OP )
+			{
+				// This line would get too long if we added $token, so add a newline first.
+				// Only do this if it won't trigger semicolon insertion and if it won't
+				// put a postfix increment operator on its own line, which is illegal in js.
+				$out .= "\n";
+				$lineLength = 0;
+			// Check, whether we have to separate the token from the last one with whitespace
+			} elseif( !isset( $opChars[$last] ) && !isset( $opChars[$ch] ) ) {
+				$out .= ' ';
+				$lineLength++;
+			// Don't accidentally create ++, -- or // tokens
+			} elseif( $last === $ch && ( $ch === '+' || $ch === '-' || $ch === '/' ) ) {
+				$out .= ' ';
+				$lineLength++;
+			}
+
+			$out .= $token;
+			$lineLength += $end - $pos; // += strlen( $token )
+			$last = $s[$end - 1];
+			$pos = $end;
+			$newlineFound = false;
+
+			// Output a newline after the token if required
+			// This is checked before AND after switching state
+			$newlineAdded = false;
+			if ( $statementsOnOwnLine && !$newlineAdded && isset( $newlineBefore[$state][$type] ) ) {
+				$out .= "\n";
+				$lineLength = 0;
+				$newlineAdded = true;
+			}
+
+			// Now that we have output our token, transition into the new state.
+			if( isset( $push[$state][$type] ) && count( $stack ) < self::STACK_LIMIT ) {
+				$stack[] = $push[$state][$type];
+			}
+			if( $stack && isset( $pop[$state][$type] ) ) {
+				$state = array_pop( $stack );
+			} elseif( isset( $goto[$state][$type] ) ) {
+				$state = $goto[$state][$type];
+			}
+
+			// Check for newline insertion again
+			if ( $statementsOnOwnLine && !$newlineAdded && isset( $newlineAfter[$state][$type] ) ) {
+				$out .= "\n";
+				$lineLength = 0;
+			}
+		}
+		return $out;
+	}
+
+	static function parseError($fullJavascript, $position, $errorMsg) {
+		// TODO: Handle the error: trigger_error, throw exception, return false...
+		return false;
+	}
+}
diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php
index 904c07c52e..a3eaed844a 100644
--- a/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@ -10,18 +10,22 @@ ob_start();
 
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('calendar');
+session_write_close();
 
 $nl="\r\n";
 $comps = array('VEVENT'=>true, 'VTODO'=>true, 'VJOURNAL'=>true);
 
-$progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
+global $progresskey;
+$progresskey = 'calendar.import-' . $_GET['progresskey'];
+
+if (isset($_GET['progress']) && $_GET['progress']) {
+	echo OC_Cache::get($progresskey);
+	die;
+}
 
 function writeProgress($pct) {
-	if(is_writable('import_tmp/')){
-		$progressfopen = fopen($progressfile, 'w');
-		fwrite($progressfopen, $pct);
-		fclose($progressfopen);
-	}
+	global $progresskey;
+	OC_Cache::set($progresskey, $pct, 300);
 }
 writeProgress('10');
 $file = OC_Filesystem::file_get_contents($_POST['path'] . '/' . $_POST['file']);
@@ -114,7 +118,5 @@ foreach($uids as $uid) {
 // finished import
 writeProgress('100');
 sleep(3);
-if(is_writable('import_tmp/')){
-	unlink($progressfile);
-}
+OC_Cache::remove($progresskey);
 OCP\JSON::success();
diff --git a/apps/calendar/import_tmp/Info b/apps/calendar/import_tmp/Info
deleted file mode 100644
index abafbce435..0000000000
--- a/apps/calendar/import_tmp/Info
+++ /dev/null
@@ -1,2 +0,0 @@
-This folder contains static files with the percentage of the import.
-Requires write permission
diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js
index 60d92f448e..838521ec7f 100644
--- a/apps/calendar/js/loader.js
+++ b/apps/calendar/js/loader.js
@@ -43,8 +43,8 @@ Calendar_Import={
 			}
 			$('#newcalendar').attr('readonly', 'readonly');
 			$('#calendar').attr('disabled', 'disabled');
-			var progressfile = $('#progressfile').val();
-			$.post(OC.filePath('calendar', 'ajax/import', 'import.php'), {method: String (method), calname: String (calname), path: String (path), file: String (filename), id: String (calid)}, function(data){
+			var progresskey = $('#progresskey').val();
+			$.post(OC.filePath('calendar', 'ajax/import', 'import.php') + '?progresskey='+progresskey, {method: String (method), calname: String (calname), path: String (path), file: String (filename), id: String (calid)}, function(data){
 				if(data.status == 'success'){
 					$('#progressbar').progressbar('option', 'value', 100);
 					$('#import_done').css('display', 'block');
@@ -52,7 +52,7 @@ Calendar_Import={
 			});
 			$('#form_container').css('display', 'none');
 			$('#progressbar_container').css('display', 'block');
-			window.setTimeout('Calendar_Import.getimportstatus(\'' + progressfile + '\')', 500);
+			window.setTimeout('Calendar_Import.getimportstatus(\'' + progresskey + '\')', 500);
 		});
 		$('#calendar').change(function(){
 			if($('#calendar option:selected').val() == 'newcal'){
@@ -62,11 +62,11 @@ Calendar_Import={
 			}
 		});
 	},
-	getimportstatus: function(progressfile){
-		$.get(OC.filePath('calendar', 'import_tmp', progressfile), function(percent){
+	getimportstatus: function(progresskey){
+		$.get(OC.filePath('calendar', 'ajax/import', 'import.php') + '?progress=1&progresskey=' + progresskey, function(percent){
 			$('#progressbar').progressbar('option', 'value', parseInt(percent));
 			if(percent < 100){
-				window.setTimeout('Calendar_Import.getimportstatus(\'' + progressfile + '\')', 500);
+				window.setTimeout('Calendar_Import.getimportstatus(\'' + progresskey + '\')', 500);
 			}else{
 				$('#import_done').css('display', 'block');
 			}
diff --git a/apps/calendar/l10n/da.php b/apps/calendar/l10n/da.php
index 5154ef1096..36551a2a93 100644
--- a/apps/calendar/l10n/da.php
+++ b/apps/calendar/l10n/da.php
@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Der blev ikke fundet nogen kalendere.",
+"No events found." => "Der blev ikke fundet nogen begivenheder.",
 "Wrong calendar" => "Forkert kalender",
 "New Timezone:" => "Ny tidszone:",
 "Timezone changed" => "Tidszone ændret",
 "Invalid request" => "Ugyldig forespørgsel",
 "Calendar" => "Kalender",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ åååå]{ '&#8212;'[ MMM] d åååå}",
 "Birthday" => "Fødselsdag",
 "Business" => "Forretning",
 "Call" => "Ring",
@@ -19,6 +22,7 @@
 "Projects" => "Projekter",
 "Questions" => "Spørgsmål",
 "Work" => "Arbejde",
+"unnamed" => "unavngivet",
 "Does not repeat" => "Gentages ikke",
 "Daily" => "Daglig",
 "Weekly" => "Ugentlig",
@@ -80,10 +84,15 @@
 "Calendars" => "Kalendere",
 "There was a fail, while parsing the file." => "Der opstod en fejl under gennemlæsning af filen.",
 "Choose active calendars" => "Vælg aktive kalendere",
+"Your calendars" => "Dine kalendere",
 "CalDav Link" => "CalDav-link",
+"Shared calendars" => "Delte kalendere",
+"No shared calendars" => "Ingen delte kalendere",
+"Share Calendar" => "Del kalender",
 "Download" => "Hent",
 "Edit" => "Rediger",
 "Delete" => "Slet",
+"shared with you by" => "delt af dig",
 "New calendar" => "Ny kalender",
 "Edit calendar" => "Rediger kalender",
 "Displayname" => "Vist navn",
@@ -94,8 +103,15 @@
 "Cancel" => "Annuller",
 "Edit an event" => "Redigér en begivenhed",
 "Export" => "Eksporter",
+"Eventinfo" => "Begivenhedsinfo",
+"Repeating" => "Gentagende",
+"Alarm" => "Alarm",
+"Attendees" => "Deltagere",
+"Share" => "Del",
 "Title of the Event" => "Titel på begivenheden",
 "Category" => "Kategori",
+"Separate categories with commas" => "Opdel kategorier med kommaer",
+"Edit categories" => "Rediger kategorier",
 "All Day Event" => "Heldagsarrangement",
 "From" => "Fra",
 "To" => "Til",
@@ -125,11 +141,22 @@
 "Calendar imported successfully" => "Kalender importeret korrekt",
 "Close Dialog" => "Luk dialog",
 "Create a new event" => "Opret en ny begivenhed",
+"View an event" => "Vis en begivenhed",
+"No categories selected" => "Ingen categorier valgt",
 "Select category" => "Vælg kategori",
+"of" => "fra",
+"at" => "kl.",
 "Timezone" => "Tidszone",
 "Check always for changes of the timezone" => "Check altid efter ændringer i tidszone",
 "Timeformat" => "Tidsformat",
 "24h" => "24T",
 "12h" => "12T",
-"Calendar CalDAV syncing address:" => "Synkroniseringsadresse til CalDAV:"
+"First day of the week" => "Ugens første dag",
+"Calendar CalDAV syncing address:" => "Synkroniseringsadresse til CalDAV:",
+"Users" => "Brugere",
+"select users" => "Vælg brugere",
+"Editable" => "Redigerbar",
+"Groups" => "Grupper",
+"select groups" => "Vælg grupper",
+"make public" => "Offentliggør"
 );
diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php
index 34e6f05f10..f12a18baad 100644
--- a/apps/calendar/l10n/de.php
+++ b/apps/calendar/l10n/de.php
@@ -4,8 +4,9 @@
 "Wrong calendar" => "Falscher Kalender",
 "New Timezone:" => "Neue Zeitzone:",
 "Timezone changed" => "Zeitzone geändert",
-"Invalid request" => "Anfragefehler",
+"Invalid request" => "Fehlerhafte Anfrage",
 "Calendar" => "Kalender",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}",
 "Birthday" => "Geburtstag",
 "Business" => "Geschäftlich",
 "Call" => "Anruf",
@@ -30,7 +31,7 @@
 "Monthly" => "monatlich",
 "Yearly" => "jährlich",
 "never" => "niemals",
-"by occurrences" => "nach Vorkommen",
+"by occurrences" => "nach Terminen",
 "by date" => "nach Datum",
 "by monthday" => "an einem Monatstag",
 "by weekday" => "an einem Wochentag",
@@ -60,10 +61,10 @@
 "October" => "Oktober",
 "November" => "November",
 "December" => "Dezember",
-"by events date" => "bei Tag des Termins",
-"by yearday(s)" => "an einem Tag des Jahres",
-"by weeknumber(s)" => "an einer Wochennummer",
-"by day and month" => "an einer Tag und Monats Kombination",
+"by events date" => "nach Tag des Termins",
+"by yearday(s)" => "nach Tag des Jahres",
+"by weeknumber(s)" => "nach Wochennummer",
+"by day and month" => "nach Tag und Monat",
 "Date" => "Datum",
 "Cal." => "Kal.",
 "All day" => "Ganztags",
@@ -91,7 +92,7 @@
 "Download" => "Herunterladen",
 "Edit" => "Bearbeiten",
 "Delete" => "Löschen",
-"shared with you by" => "Von dir geteilt mit",
+"shared with you by" => "Geteilt mit dir von",
 "New calendar" => "Neuer Kalender",
 "Edit calendar" => "Kalender bearbeiten",
 "Displayname" => "Anzeigename",
@@ -109,7 +110,7 @@
 "Share" => "Teilen",
 "Title of the Event" => "Name",
 "Category" => "Kategorie",
-"Separate categories with commas" => "Kategorien trennen mittels Komma",
+"Separate categories with commas" => "Kategorien mit Kommas trennen",
 "Edit categories" => "Kategorien ändern",
 "All Day Event" => "Ganztägiges Ereignis",
 "From" => "von",
@@ -130,8 +131,8 @@
 "and the events week of year." => "und den Tag des Jahres vom Termin",
 "Interval" => "Intervall",
 "End" => "Ende",
-"occurrences" => "Vorkommen",
-"Import a calendar file" => "Kalender Datei Importieren",
+"occurrences" => "Termine",
+"Import a calendar file" => "Kalenderdatei Importieren",
 "Please choose the calendar" => "Bitte wählen Sie den Kalender.",
 "create a new calendar" => "Neuen Kalender anlegen",
 "Name of new calendar" => "Kalendername",
@@ -144,6 +145,7 @@
 "No categories selected" => "Keine Kategorie ausgewählt",
 "Select category" => "Kategorie auswählen",
 "of" => "von",
+"at" => "um",
 "Timezone" => "Zeitzone",
 "Check always for changes of the timezone" => "immer die Zeitzone überprüfen",
 "Timeformat" => "Zeitformat",
@@ -152,9 +154,9 @@
 "First day of the week" => "erster Wochentag",
 "Calendar CalDAV syncing address:" => "Kalender CalDAV Synchronisationsadresse:",
 "Users" => "Nutzer",
-"select users" => "gewählte Nutzer",
+"select users" => "Nutzer auswählen",
 "Editable" => "editierbar",
 "Groups" => "Gruppen",
-"select groups" => "Wähle Gruppen",
+"select groups" => "Gruppen auswählen",
 "make public" => "Veröffentlichen"
 );
diff --git a/apps/calendar/l10n/fi_FI.php b/apps/calendar/l10n/fi_FI.php
new file mode 100644
index 0000000000..4de94b7b7b
--- /dev/null
+++ b/apps/calendar/l10n/fi_FI.php
@@ -0,0 +1,138 @@
+<?php $TRANSLATIONS = array(
+"No calendars found." => "Kalentereita ei löytynyt",
+"No events found." => "Tapahtumia ei löytynyt.",
+"Wrong calendar" => "Väärä kalenteri",
+"New Timezone:" => "Uusi aikavyöhyke:",
+"Timezone changed" => "Aikavyöhyke vaihdettu",
+"Invalid request" => "Virheellinen pyyntö",
+"Calendar" => "Kalenteri",
+"Birthday" => "Syntymäpäivä",
+"Call" => "Ota yhteyttä",
+"Clients" => "Asiakkaat",
+"Deliverer" => "Toimittaja",
+"Holidays" => "Vapaapäivät",
+"Ideas" => "Ideat",
+"Journey" => "Matkustus",
+"Jubilee" => "Vuosipäivät",
+"Meeting" => "Tapaamiset",
+"Other" => "Muut",
+"Personal" => "Henkilökohtainen",
+"Projects" => "Projektit",
+"Questions" => "Kysymykset",
+"Work" => "Työ",
+"unnamed" => "nimetön",
+"Does not repeat" => "Ei toistoa",
+"Daily" => "Päivittäin",
+"Weekly" => "Viikottain",
+"Every Weekday" => "Arkipäivisin",
+"Bi-Weekly" => "Joka toinen viikko",
+"Monthly" => "Kuukausittain",
+"Yearly" => "Vuosittain",
+"never" => "Ei koskaan",
+"Monday" => "Maanantai",
+"Tuesday" => "Tiistai",
+"Wednesday" => "Keskiviikko",
+"Thursday" => "Torstai",
+"Friday" => "Perjantai",
+"Saturday" => "Lauantai",
+"Sunday" => "Sunnuntai",
+"first" => "ensimmäinen",
+"second" => "toinen",
+"third" => "kolmas",
+"fourth" => "neljäs",
+"fifth" => "viides",
+"last" => "viimeinen",
+"January" => "Tammikuu",
+"February" => "Helmikuu",
+"March" => "Maaliskuu",
+"April" => "Huhtikuu",
+"May" => "Toukokuu",
+"June" => "Kesäkuu",
+"July" => "Heinäkuu",
+"August" => "Elokuu",
+"September" => "Syyskuu",
+"October" => "Lokakuu",
+"November" => "Marraskuu",
+"December" => "Joulukuu",
+"Date" => "Päivämäärä",
+"All day" => "Koko päivä",
+"New Calendar" => "Uusi kalenteri",
+"Missing fields" => "Puuttuvat kentät",
+"Title" => "Otsikko",
+"The event ends before it starts" => "Tapahtuma päättyy ennen alkamistaan",
+"There was a database fail" => "Tapahtui tietokantavirhe",
+"Week" => "Viikko",
+"Month" => "Kuukausi",
+"List" => "Lista",
+"Today" => "Tänään",
+"Calendars" => "Kalenterit",
+"There was a fail, while parsing the file." => "Tiedostoa jäsennettäessä tapahtui virhe.",
+"Choose active calendars" => "Valitse aktiiviset kalenterit",
+"Your calendars" => "Omat kalenterisi",
+"CalDav Link" => "CalDav-linkki",
+"Shared calendars" => "Jaetut kalenterit",
+"No shared calendars" => "Ei jaettuja kalentereita",
+"Share Calendar" => "Jaa kalenteri",
+"Download" => "Lataa",
+"Edit" => "Muokkaa",
+"Delete" => "Poista",
+"shared with you by" => "kanssasi jaettu",
+"New calendar" => "Uusi kalenteri",
+"Edit calendar" => "Muokkaa kalenteria",
+"Displayname" => "Kalenterin nimi",
+"Active" => "Aktiivinen",
+"Calendar color" => "Kalenterin väri",
+"Save" => "Tallenna",
+"Submit" => "Talleta",
+"Cancel" => "Peru",
+"Edit an event" => "Muokkaa tapahtumaa",
+"Export" => "Vie",
+"Eventinfo" => "Tapahtumatiedot",
+"Repeating" => "Toisto",
+"Alarm" => "Hälytys",
+"Attendees" => "Osallistujat",
+"Share" => "Jaa",
+"Title of the Event" => "Tapahtuman otsikko",
+"Category" => "Luokka",
+"Separate categories with commas" => "Erota luokat pilkuilla",
+"Edit categories" => "Muokkaa luokkia",
+"All Day Event" => "Koko päivän tapahtuma",
+"From" => "Alkaa",
+"To" => "Päättyy",
+"Advanced options" => "Tarkemmat asetukset",
+"Location" => "Sijainti",
+"Location of the Event" => "Tapahtuman sijainti",
+"Description" => "Kuvaus",
+"Description of the Event" => "Tapahtuman kuvaus",
+"Repeat" => "Toisto",
+"Select weekdays" => "Valitse viikonpäivät",
+"Select days" => "Valitse päivät",
+"Select months" => "Valitse kuukaudet",
+"Select weeks" => "Valitse viikot",
+"Interval" => "Intervalli",
+"Import a calendar file" => "Tuo kalenteritiedosto",
+"Please choose the calendar" => "Valitse kalenteri",
+"create a new calendar" => "luo uusi kalenteri",
+"Name of new calendar" => "Uuden kalenterin nimi",
+"Import" => "Tuo",
+"Importing calendar" => "Tuodaan kalenteria",
+"Calendar imported successfully" => "Kalenteri tuotu onnistuneesti",
+"Close Dialog" => "Sulje ikkuna",
+"Create a new event" => "Luo uusi tapahtuma",
+"View an event" => "Avaa tapahtuma",
+"No categories selected" => "Luokkia ei ole valittu",
+"Select category" => "Valitse luokka",
+"Timezone" => "Aikavyöhyke",
+"Check always for changes of the timezone" => "Tarkista aina aikavyöhykkeen muutokset",
+"Timeformat" => "Ajan esitysmuoto",
+"24h" => "24 tuntia",
+"12h" => "12 tuntia",
+"First day of the week" => "Viikon ensimmäinen päivä",
+"Calendar CalDAV syncing address:" => "Kalenterin CalDAV-synkronointiosoite:",
+"Users" => "Käyttäjät",
+"select users" => "valitse käyttäjät",
+"Editable" => "Muoktattava",
+"Groups" => "Ryhmät",
+"select groups" => "valitse ryhmät",
+"make public" => "aseta julkiseksi"
+);
diff --git a/apps/calendar/l10n/gl.php b/apps/calendar/l10n/gl.php
index 7c747be26f..3178b1819e 100644
--- a/apps/calendar/l10n/gl.php
+++ b/apps/calendar/l10n/gl.php
@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Non se atoparon calendarios.",
+"No events found." => "Non se atoparon eventos.",
 "Wrong calendar" => "Calendario equivocado",
 "New Timezone:" => "Novo fuso horario:",
 "Timezone changed" => "Fuso horario trocado",
 "Invalid request" => "Petición non válida",
 "Calendar" => "Calendario",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d MMM[ yyyy]{ '&#8212;'d [ MMM] yyyy}",
 "Birthday" => "Aniversario",
 "Business" => "Traballo",
 "Call" => "Chamada",
@@ -19,6 +22,7 @@
 "Projects" => "Proxectos",
 "Questions" => "Preguntas",
 "Work" => "Traballo",
+"unnamed" => "sen nome",
 "Does not repeat" => "Non se repite",
 "Daily" => "A diario",
 "Weekly" => "Semanalmente",
@@ -80,10 +84,15 @@
 "Calendars" => "Calendarios",
 "There was a fail, while parsing the file." => "Produciuse un erro ao procesar o ficheiro",
 "Choose active calendars" => "Escolla os calendarios activos",
+"Your calendars" => "Os seus calendarios",
 "CalDav Link" => "Ligazón CalDav",
+"Shared calendars" => "Calendarios compartidos",
+"No shared calendars" => "Sen calendarios compartidos",
+"Share Calendar" => "Compartir calendario",
 "Download" => "Descargar",
 "Edit" => "Editar",
 "Delete" => "Borrar",
+"shared with you by" => "compartido con vostede por",
 "New calendar" => "Novo calendario",
 "Edit calendar" => "Editar calendario",
 "Displayname" => "Mostrar nome",
@@ -94,8 +103,15 @@
 "Cancel" => "Cancelar",
 "Edit an event" => "Editar un evento",
 "Export" => "Exportar",
+"Eventinfo" => "Info do evento",
+"Repeating" => "Repetido",
+"Alarm" => "Alarma",
+"Attendees" => "Participantes",
+"Share" => "Compartir",
 "Title of the Event" => "Título do evento",
 "Category" => "Categoría",
+"Separate categories with commas" => "Separe as categorías con comas",
+"Edit categories" => "Editar categorías",
 "All Day Event" => "Eventos do día",
 "From" => "Desde",
 "To" => "a",
@@ -125,11 +141,22 @@
 "Calendar imported successfully" => "Calendario importado correctamente",
 "Close Dialog" => "Pechar diálogo",
 "Create a new event" => "Crear un novo evento",
+"View an event" => "Ver un evento",
+"No categories selected" => "Non seleccionou as categorías",
 "Select category" => "Seleccionar categoría",
+"of" => "de",
+"at" => "a",
 "Timezone" => "Fuso horario",
 "Check always for changes of the timezone" => "Comprobar sempre cambios de fuso horario",
 "Timeformat" => "Formato de hora",
 "24h" => "24h",
 "12h" => "12h",
-"Calendar CalDAV syncing address:" => "Enderezo de sincronización do calendario CalDAV:"
+"First day of the week" => "Primeiro día da semana",
+"Calendar CalDAV syncing address:" => "Enderezo de sincronización do calendario CalDAV:",
+"Users" => "Usuarios",
+"select users" => "escoller usuarios",
+"Editable" => "Editable",
+"Groups" => "Grupos",
+"select groups" => "escoller grupos",
+"make public" => "facer público"
 );
diff --git a/apps/calendar/l10n/he.php b/apps/calendar/l10n/he.php
index d8bd1c5f00..c161d3be2e 100644
--- a/apps/calendar/l10n/he.php
+++ b/apps/calendar/l10n/he.php
@@ -1,8 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "לא נמצאו לוחות שנה.",
+"No events found." => "לא נמצאו אירועים.",
 "Wrong calendar" => "לוח שנה לא נכון",
+"New Timezone:" => "אזור זמן חדש:",
 "Timezone changed" => "אזור זמן השתנה",
 "Invalid request" => "בקשה לא חוקית",
 "Calendar" => "ח שנה",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d MMM [ yyyy]{ '&#8212;'d[ MMM] yyyy}",
 "Birthday" => "יום הולדת",
 "Business" => "עסקים",
 "Call" => "שיחה",
@@ -18,6 +22,7 @@
 "Projects" => "פרוייקטים",
 "Questions" => "שאלות",
 "Work" => "עבודה",
+"unnamed" => "ללא שם",
 "Does not repeat" => "ללא חזרה",
 "Daily" => "יומי",
 "Weekly" => "שבועי",
@@ -25,9 +30,53 @@
 "Bi-Weekly" => "דו שבועי",
 "Monthly" => "חודשי",
 "Yearly" => "שנתי",
+"never" => "לעולם לא",
+"by occurrences" => "לפי מופעים",
+"by date" => "לפי תאריך",
+"by monthday" => "לפי היום בחודש",
+"by weekday" => "לפי היום בשבוע",
+"Monday" => "יום שני",
+"Tuesday" => "יום שלישי",
+"Wednesday" => "יום רביעי",
+"Thursday" => "יום חמישי",
+"Friday" => "יום שישי",
+"Saturday" => "שבת",
+"Sunday" => "יום ראשון",
+"events week of month" => "שבוע בחודש לציון הפעילות",
+"first" => "ראשון",
+"second" => "שני",
+"third" => "שלישי",
+"fourth" => "רביעי",
+"fifth" => "חמישי",
+"last" => "אחרון",
+"January" => "ינואר",
+"February" => "פברואר",
+"March" => "מרץ",
+"April" => "אפריל",
+"May" => "מאי",
+"June" => "יוני",
+"July" => "יולי",
+"August" => "אוגוסט",
+"September" => "ספטמבר",
+"October" => "אוקטובר",
+"November" => "נובמבר",
+"December" => "דצמבר",
+"by events date" => "לפי תאריכי האירועים",
+"by yearday(s)" => "לפי ימים בשנה",
+"by weeknumber(s)" => "לפי מספרי השבועות",
+"by day and month" => "לפי יום וחודש",
+"Date" => "תאריך",
+"Cal." => "לוח שנה",
 "All day" => "היום",
 "New Calendar" => "לוח שנה חדש",
+"Missing fields" => "שדות חסרים",
 "Title" => "כותרת",
+"From Date" => "מתאריך",
+"From Time" => "משעה",
+"To Date" => "עד תאריך",
+"To Time" => "עד שעה",
+"The event ends before it starts" => "האירוע מסתיים עוד לפני שהתחיל",
+"There was a database fail" => "אירע כשל במסד הנתונים",
 "Week" => "שבוע",
 "Month" => "חודש",
 "List" => "רשימה",
@@ -35,10 +84,15 @@
 "Calendars" => "לוחות שנה",
 "There was a fail, while parsing the file." => "אירעה שגיאה בעת פענוח הקובץ.",
 "Choose active calendars" => "בחר לוחות שנה פעילים",
+"Your calendars" => "לוחות השנה שלך",
 "CalDav Link" => "קישור CalDav",
+"Shared calendars" => "לוחות שנה מושתפים",
+"No shared calendars" => "אין לוחות שנה משותפים",
+"Share Calendar" => "שיתוף לוח שנה",
 "Download" => "הורדה",
 "Edit" => "עריכה",
 "Delete" => "מחיקה",
+"shared with you by" => "שותף אתך על ידי",
 "New calendar" => "לוח שנה חדש",
 "Edit calendar" => "עריכת לוח שנה",
 "Displayname" => "שם תצוגה",
@@ -49,18 +103,60 @@
 "Cancel" => "ביטול",
 "Edit an event" => "עריכת אירוע",
 "Export" => "יצוא",
+"Eventinfo" => "פרטי האירוע",
+"Repeating" => "חוזר",
+"Alarm" => "תזכורת",
+"Attendees" => "משתתפים",
+"Share" => "שיתוף",
 "Title of the Event" => "כותרת האירוע",
 "Category" => "קטגוריה",
+"Separate categories with commas" => "הפרדת קטגוריות בפסיק",
+"Edit categories" => "עריכת קטגוריות",
 "All Day Event" => "אירוע של כל היום",
 "From" => "מאת",
 "To" => "עבור",
+"Advanced options" => "אפשרויות מתקדמות",
 "Location" => "מיקום",
 "Location of the Event" => "מיקום האירוע",
 "Description" => "תיאור",
 "Description of the Event" => "תיאור האירוע",
 "Repeat" => "חזרה",
+"Advanced" => "מתקדם",
+"Select weekdays" => "יש לבחור ימים בשבוע",
+"Select days" => "יש לבחור בימים",
+"and the events day of year." => "ויום האירוע בשנה.",
+"and the events day of month." => "ויום האירוע בחודש.",
+"Select months" => "יש לבחור בחודשים",
+"Select weeks" => "יש לבחור בשבועות",
+"and the events week of year." => "ומספור השבוע הפעיל בשנה.",
+"Interval" => "משך",
+"End" => "סיום",
+"occurrences" => "מופעים",
+"Import a calendar file" => "יבוא קובץ לוח שנה",
+"Please choose the calendar" => "נא לבחור את לוח השנה",
+"create a new calendar" => "יצירת לוח שנה חדש",
+"Name of new calendar" => "שם לוח השנה החדש",
 "Import" => "יבוא",
+"Importing calendar" => "היומן מייובא",
+"Calendar imported successfully" => "היומן ייובא בהצלחה",
+"Close Dialog" => "סגירת הדו־שיח",
 "Create a new event" => "יצירת אירוע חדש",
+"View an event" => "צפייה באירוע",
+"No categories selected" => "לא נבחרו קטגוריות",
 "Select category" => "בחר קטגוריה",
-"Timezone" => "אזור זמן"
+"of" => "מתוך",
+"at" => "בשנה",
+"Timezone" => "אזור זמן",
+"Check always for changes of the timezone" => "יש לבדוק תמיד אם יש הבדלים באזורי הזמן",
+"Timeformat" => "מבנה התאריך",
+"24h" => "24 שעות",
+"12h" => "12 שעות",
+"First day of the week" => "היום הראשון בשבוע",
+"Calendar CalDAV syncing address:" => "כתובת הסנכרון ללוח שנה מסוג CalDAV:",
+"Users" => "משתמשים",
+"select users" => "נא לבחור במשתמשים",
+"Editable" => "ניתן לעריכה",
+"Groups" => "קבוצות",
+"select groups" => "בחירת קבוצות",
+"make public" => "הפיכה לציבורי"
 );
diff --git a/apps/calendar/l10n/hr.php b/apps/calendar/l10n/hr.php
index 2b2efacd31..551bb4abbc 100644
--- a/apps/calendar/l10n/hr.php
+++ b/apps/calendar/l10n/hr.php
@@ -1,14 +1,18 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Nisu pronađeni kalendari",
+"No events found." => "Događaj nije pronađen.",
 "Wrong calendar" => "Pogrešan kalendar",
+"New Timezone:" => "Nova vremenska zona:",
 "Timezone changed" => "Vremenska zona promijenjena",
 "Invalid request" => "Neispravan zahtjev",
 "Calendar" => "Kalendar",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "Rođendan",
 "Business" => "Poslovno",
 "Call" => "Poziv",
 "Clients" => "Klijenti",
 "Deliverer" => "Dostavljač",
-"Holidays" => "Odmori",
+"Holidays" => "Praznici",
 "Ideas" => "Ideje",
 "Journey" => "Putovanje",
 "Jubilee" => "Obljetnica",
@@ -18,6 +22,7 @@
 "Projects" => "Projekti",
 "Questions" => "Pitanja",
 "Work" => "Posao",
+"unnamed" => "bezimeno",
 "Does not repeat" => "Ne ponavlja se",
 "Daily" => "Dnevno",
 "Weekly" => "Tjedno",
@@ -25,14 +30,50 @@
 "Bi-Weekly" => "Dvotjedno",
 "Monthly" => "Mjesečno",
 "Yearly" => "Godišnje",
+"never" => "nikad",
+"by occurrences" => "po pojavama",
+"by date" => "po datum",
+"by monthday" => "po dana mjeseca",
+"by weekday" => "po tjednu",
+"Monday" => "ponedeljak",
+"Tuesday" => "utorak",
+"Wednesday" => "srijeda",
+"Thursday" => "četvrtak",
+"Friday" => "petak",
+"Saturday" => "subota",
+"Sunday" => "nedelja",
+"first" => "prvi",
+"second" => "drugi",
+"third" => "treći",
+"fourth" => "četvrti",
+"fifth" => "peti",
+"last" => "zadnji",
+"January" => "siječanj",
+"February" => "veljača",
+"March" => "ožujak",
+"April" => "travanj",
+"May" => "svibanj",
+"June" => "lipanj",
+"July" => "srpanj",
+"August" => "kolovoz",
+"September" => "rujan",
+"October" => "listopad",
+"November" => "studeni",
+"December" => "prosinac",
+"by events date" => "po datumu događaja",
+"by yearday(s)" => "po godini(-nama)",
+"by weeknumber(s)" => "po broju tjedna(-ana)",
+"by day and month" => "po danu i mjeseca",
+"Date" => "datum",
+"Cal." => "Kal.",
 "All day" => "Cijeli dan",
-"New Calendar" => "Novi Kalendar",
+"New Calendar" => "Novi kalendar",
 "Missing fields" => "Nedostaju polja",
 "Title" => "Naslov",
-"From Date" => "Datum Od",
-"From Time" => "Vrijeme Od",
-"To Date" => "Datum Do",
-"To Time" => "Vrijeme Do",
+"From Date" => "Datum od",
+"From Time" => "Vrijeme od",
+"To Date" => "Datum do",
+"To Time" => "Vrijeme do",
 "The event ends before it starts" => "Događaj završava prije nego počinje",
 "There was a database fail" => "Pogreška u bazi podataka",
 "Week" => "Tjedan",
@@ -41,11 +82,16 @@
 "Today" => "Danas",
 "Calendars" => "Kalendari",
 "There was a fail, while parsing the file." => "Pogreška pri čitanju datoteke.",
-"Choose active calendars" => "Odaberite aktive kalendare",
-"CalDav Link" => "CalDav Poveznica",
+"Choose active calendars" => "Odabir aktivnih kalendara",
+"Your calendars" => "Vaši kalendari",
+"CalDav Link" => "CalDav poveznica",
+"Shared calendars" => "Podijeljeni kalendari",
+"No shared calendars" => "Nema zajedničkih kalendara",
+"Share Calendar" => "Podjeli kalendar",
 "Download" => "Spremi lokalno",
 "Edit" => "Uredi",
 "Delete" => "Briši",
+"shared with you by" => "podijeljeno s vama od ",
 "New calendar" => "Novi kalendar",
 "Edit calendar" => "Uredi kalendar",
 "Displayname" => "Naziv",
@@ -56,24 +102,57 @@
 "Cancel" => "Odustani",
 "Edit an event" => "Uredi događaj",
 "Export" => "Izvoz",
-"Title of the Event" => "Naslov Događaja",
+"Eventinfo" => "Informacije o događaju",
+"Repeating" => "Ponavljanje",
+"Alarm" => "Alarm",
+"Attendees" => "Polaznici",
+"Share" => "Podijeli",
+"Title of the Event" => "Naslov događaja",
 "Category" => "Kategorija",
+"Separate categories with commas" => "Odvoji kategorije zarezima",
+"Edit categories" => "Uredi kategorije",
 "All Day Event" => "Cjelodnevni događaj",
 "From" => "Od",
 "To" => "Za",
 "Advanced options" => "Napredne mogućnosti",
 "Location" => "Lokacija",
-"Location of the Event" => "Lokacija Događaja",
+"Location of the Event" => "Lokacija događaja",
 "Description" => "Opis",
 "Description of the Event" => "Opis događaja",
 "Repeat" => "Ponavljanje",
-"Please choose the calendar" => "Odaberite kalendar",
+"Advanced" => "Napredno",
+"Select weekdays" => "Odaberi dane u tjednu",
+"Select days" => "Odaberi dane",
+"Select months" => "Odaberi mjesece",
+"Select weeks" => "Odaberi tjedne",
+"Interval" => "Interval",
+"End" => "Kraj",
+"occurrences" => "pojave",
+"Import a calendar file" => "Uvozite datoteku kalendara",
+"Please choose the calendar" => "Odaberi kalendar",
+"create a new calendar" => "stvori novi kalendar",
+"Name of new calendar" => "Ime novog kalendara",
 "Import" => "Uvoz",
+"Importing calendar" => "Uvoz kalendara",
+"Calendar imported successfully" => "Kalendar je uspješno uvezen",
+"Close Dialog" => "Zatvori dijalog",
 "Create a new event" => "Unesi novi događaj",
+"View an event" => "Vidjeti događaj",
+"No categories selected" => "Nema odabranih kategorija",
 "Select category" => "Odabir kategorije",
+"of" => "od",
+"at" => "na",
 "Timezone" => "Vremenska zona",
+"Check always for changes of the timezone" => "Provjerite uvijek za promjene vremenske zone",
 "Timeformat" => "Format vremena",
 "24h" => "24h",
 "12h" => "12h",
-"Calendar CalDAV syncing address:" => "Adresa za CalDAV sinkronizaciju kalendara"
+"First day of the week" => "Prvi dan tjedna",
+"Calendar CalDAV syncing address:" => "Adresa za CalDAV sinkronizaciju kalendara:",
+"Users" => "Korisnici",
+"select users" => "odaberi korisnike",
+"Editable" => "Može se uređivati",
+"Groups" => "Grupe",
+"select groups" => "izaberite grupe",
+"make public" => "podjeli s javnošću"
 );
diff --git a/apps/calendar/l10n/ja_JP.php b/apps/calendar/l10n/ja_JP.php
index d4a4b5f018..c533a9bd1a 100644
--- a/apps/calendar/l10n/ja_JP.php
+++ b/apps/calendar/l10n/ja_JP.php
@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "カレンダーが見つかりませんでした。",
+"No events found." => "イベントが見つかりませんでした。",
 "Wrong calendar" => "誤ったカレンダーです",
 "New Timezone:" => "新しいタイムゾーン:",
 "Timezone changed" => "タイムゾーンが変更されました",
 "Invalid request" => "無効なリクエストです",
 "Calendar" => "カレンダー",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "誕生日",
 "Business" => "ビジネス",
 "Call" => "電話をかける",
@@ -18,7 +21,7 @@
 "Personal" => "個人",
 "Projects" => "プロジェクト",
 "Questions" => "質問事項",
-"Work" => "仕事",
+"Work" => "週の始まり",
 "Does not repeat" => "繰り返さない",
 "Daily" => "毎日",
 "Weekly" => "毎週",
@@ -31,13 +34,13 @@
 "by date" => "日付で指定",
 "by monthday" => "日にちで指定",
 "by weekday" => "曜日で指定",
-"Monday" => "月曜日",
-"Tuesday" => "火曜日",
-"Wednesday" => "水曜日",
-"Thursday" => "木曜日",
-"Friday" => "金曜日",
-"Saturday" => "土曜日",
-"Sunday" => "日曜日",
+"Monday" => "月曜",
+"Tuesday" => "火曜",
+"Wednesday" => "水曜",
+"Thursday" => "木曜",
+"Friday" => "金曜",
+"Saturday" => "土曜",
+"Sunday" => "日曜",
 "events week of month" => "予定のある週を指定",
 "first" => "１週目",
 "second" => "２週目",
@@ -64,7 +67,7 @@
 "Date" => "日付",
 "Cal." => "カレンダー",
 "All day" => "終日",
-"New Calendar" => "新しくカレンダーを作成する",
+"New Calendar" => "新しくカレンダーを作成",
 "Missing fields" => "項目がありません",
 "Title" => "タイトル",
 "From Date" => "開始日",
@@ -72,19 +75,23 @@
 "To Date" => "終了日",
 "To Time" => "終了時間",
 "The event ends before it starts" => "イベント終了時間が開始時間より先です",
-"There was a database fail" => "データベースフェイルがありました",
+"There was a database fail" => "データベースのエラーがありました",
 "Week" => "週",
 "Month" => "月",
 "List" => "リスト",
 "Today" => "今日",
 "Calendars" => "カレンダー",
-"There was a fail, while parsing the file." => "ファイルを構文解析する際に失敗しました",
-"Choose active calendars" => "アクティブなカレンダーを選択してください",
+"There was a fail, while parsing the file." => "ファイルの構文解析に失敗しました。",
+"Choose active calendars" => "アクティブなカレンダーを選択",
+"Your calendars" => "あなたのカレンダー",
 "CalDav Link" => "CalDavへのリンク",
+"Shared calendars" => "共有カレンダー",
+"No shared calendars" => "共有カレンダーはありません",
+"Share Calendar" => "カレンダーを共有する",
 "Download" => "ダウンロード",
 "Edit" => "編集",
 "Delete" => "削除",
-"New calendar" => "新しくカレンダーを作成する",
+"New calendar" => "新しいカレンダー",
 "Edit calendar" => "カレンダーを編集",
 "Displayname" => "表示名",
 "Active" => "アクティブ",
@@ -94,8 +101,15 @@
 "Cancel" => "キャンセル",
 "Edit an event" => "イベントを編集",
 "Export" => "エクスポート",
+"Eventinfo" => "イベント情報",
+"Repeating" => "繰り返し",
+"Alarm" => "アラーム",
+"Attendees" => "参加者",
+"Share" => "共有",
 "Title of the Event" => "イベントのタイトル",
 "Category" => "カテゴリー",
+"Separate categories with commas" => "カテゴリをコンマで区切る",
+"Edit categories" => "カテゴリを編集",
 "All Day Event" => "終日イベント",
 "From" => "開始",
 "To" => "終了",
@@ -103,8 +117,8 @@
 "Location" => "場所",
 "Location of the Event" => "イベントの場所",
 "Description" => "メモ",
-"Description of the Event" => "イベントのメモ",
-"Repeat" => "繰り返す",
+"Description of the Event" => "イベントの説明",
+"Repeat" => "繰り返し",
 "Advanced" => "詳細設定",
 "Select weekdays" => "曜日を指定",
 "Select days" => "日付を指定",
@@ -113,7 +127,7 @@
 "Select months" => "月を指定する",
 "Select weeks" => "週を指定する",
 "and the events week of year." => "対象の週を選択する。",
-"Interval" => "周期",
+"Interval" => "間隔",
 "End" => "繰り返す期間",
 "occurrences" => "回繰り返す",
 "Import a calendar file" => "カレンダーファイルをインポート",
@@ -123,13 +137,24 @@
 "Import" => "インポート",
 "Importing calendar" => "カレンダーを取り込み中",
 "Calendar imported successfully" => "カレンダーの取り込みに成功しました",
-"Close Dialog" => "閉じる",
-"Create a new event" => "新しいイベントを作成する",
+"Close Dialog" => "ダイアログを閉じる",
+"Create a new event" => "新しいイベントを作成",
+"View an event" => "イベントを閲覧",
+"No categories selected" => "カテゴリが選択されていません",
 "Select category" => "カテゴリーを選択してください",
+"of" => "of",
+"at" => "at",
 "Timezone" => "タイムゾーン",
-"Check always for changes of the timezone" => "タイムゾーン変更を常に確認する",
+"Check always for changes of the timezone" => "タイムゾーンの変更を常に確認",
 "Timeformat" => "時刻のフォーマット",
-"24h" => "24時間制",
-"12h" => "12時間制",
-"Calendar CalDAV syncing address:" => "カレンダーのCalDAVシンクアドレス"
+"24h" => "24h",
+"12h" => "12h",
+"First day of the week" => "週の始まり",
+"Calendar CalDAV syncing address:" => "CalDAVカレンダーの同期アドレス:",
+"Users" => "ユーザ",
+"select users" => "ユーザを選択",
+"Editable" => "編集可能",
+"Groups" => "グループ",
+"select groups" => "グループを選択",
+"make public" => "公開する"
 );
diff --git a/apps/calendar/l10n/lb.php b/apps/calendar/l10n/lb.php
index 23e94d1cd1..b40f652cc5 100644
--- a/apps/calendar/l10n/lb.php
+++ b/apps/calendar/l10n/lb.php
@@ -1,8 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Keng Kalenner fonnt.",
+"No events found." => "Keng Evenementer fonnt.",
 "Wrong calendar" => "Falschen Kalenner",
+"New Timezone:" => "Nei Zäitzone:",
 "Timezone changed" => "Zäitzon geännert",
 "Invalid request" => "Ongülteg Requête",
 "Calendar" => "Kalenner",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "Gebuertsdag",
 "Business" => "Geschäftlech",
 "Call" => "Uruff",
@@ -25,6 +29,38 @@
 "Bi-Weekly" => "All zweet Woch",
 "Monthly" => "All Mount",
 "Yearly" => "All Joer",
+"never" => "ni",
+"by occurrences" => "no Virkommes",
+"by date" => "no Datum",
+"by monthday" => "no Mount-Dag",
+"by weekday" => "no Wochendag",
+"Monday" => "Méindes",
+"Tuesday" => "Dënschdes",
+"Wednesday" => "Mëttwoch",
+"Thursday" => "Donneschdes",
+"Friday" => "Freides",
+"Saturday" => "Samschdes",
+"Sunday" => "Sonndes",
+"first" => "éischt",
+"second" => "Sekonn",
+"third" => "Drëtt",
+"fourth" => "Féiert",
+"fifth" => "Fënneft",
+"last" => "Läscht",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "Mäerz",
+"April" => "Abrëll",
+"May" => "Mee",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Dezember",
+"Date" => "Datum",
+"Cal." => "Cal.",
 "All day" => "All Dag",
 "New Calendar" => "Neien Kalenner",
 "Missing fields" => "Felder déi feelen",
@@ -42,7 +78,10 @@
 "Calendars" => "Kalenneren",
 "There was a fail, while parsing the file." => "Feeler beim lueden vum Fichier.",
 "Choose active calendars" => "Wiel aktiv Kalenneren aus",
+"Your calendars" => "Deng Kalenneren",
 "CalDav Link" => "CalDav Link",
+"Shared calendars" => "Gedeelte Kalenneren",
+"No shared calendars" => "Keng gedeelten Kalenneren",
 "Download" => "Eroflueden",
 "Edit" => "Editéieren",
 "Delete" => "Läschen",
@@ -67,8 +106,22 @@
 "Description" => "Beschreiwung",
 "Description of the Event" => "Beschreiwung vum Evenement",
 "Repeat" => "Widderhuelen",
+"Advanced" => "Erweidert",
+"Select weekdays" => "Wochendeeg auswielen",
+"Select days" => "Deeg auswielen",
+"Select months" => "Méint auswielen",
+"Select weeks" => "Wochen auswielen",
+"Interval" => "Intervall",
+"End" => "Enn",
+"occurrences" => "Virkommes",
+"Import a calendar file" => "E Kalenner Fichier importéieren",
 "Please choose the calendar" => "Wiel den Kalenner aus",
+"create a new calendar" => "E neie Kalenner uleeën",
+"Name of new calendar" => "Numm vum neie Kalenner",
 "Import" => "Import",
+"Importing calendar" => "Importéiert Kalenner",
+"Calendar imported successfully" => "Kalenner erfollegräich importéiert",
+"Close Dialog" => "Dialog zoumaachen",
 "Create a new event" => "En Evenement maachen",
 "Select category" => "Kategorie auswielen",
 "Timezone" => "Zäitzon",
diff --git a/apps/calendar/l10n/lt_LT.php b/apps/calendar/l10n/lt_LT.php
index 3edf7b5469..d7e15fb438 100644
--- a/apps/calendar/l10n/lt_LT.php
+++ b/apps/calendar/l10n/lt_LT.php
@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Kalendorių nerasta.",
+"No events found." => "Įvykių nerasta.",
 "Wrong calendar" => "Ne tas kalendorius",
 "New Timezone:" => "Nauja laiko juosta:",
 "Timezone changed" => "Laiko zona pakeista",
 "Invalid request" => "Klaidinga užklausa",
 "Calendar" => "Kalendorius",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "Gimtadienis",
 "Business" => "Verslas",
 "Call" => "Skambučiai",
@@ -19,6 +22,7 @@
 "Projects" => "Projektai",
 "Questions" => "Klausimai",
 "Work" => "Darbas",
+"unnamed" => "be pavadinimo",
 "Does not repeat" => "Nekartoti",
 "Daily" => "Kasdien",
 "Weekly" => "Kiekvieną savaitę",
@@ -68,7 +72,11 @@
 "Calendars" => "Kalendoriai",
 "There was a fail, while parsing the file." => "Apdorojant failą įvyko klaida.",
 "Choose active calendars" => "Pasirinkite naudojamus kalendorius",
+"Your calendars" => "Jūsų kalendoriai",
 "CalDav Link" => "CalDav adresas",
+"Shared calendars" => "Bendri kalendoriai",
+"No shared calendars" => "Bendrų kalendorių nėra",
+"Share Calendar" => "Dalintis kalendoriumi",
 "Download" => "Atsisiųsti",
 "Edit" => "Keisti",
 "Delete" => "Trinti",
@@ -82,8 +90,14 @@
 "Cancel" => "Atšaukti",
 "Edit an event" => "Taisyti įvykį",
 "Export" => "Eksportuoti",
+"Eventinfo" => "Informacija",
+"Repeating" => "Pasikartojantis",
+"Attendees" => "Dalyviai",
+"Share" => "Dalintis",
 "Title of the Event" => "Įvykio pavadinimas",
 "Category" => "Kategorija",
+"Separate categories with commas" => "Atskirkite kategorijas kableliais",
+"Edit categories" => "Redaguoti kategorijas",
 "All Day Event" => "Visos dienos įvykis",
 "From" => "Nuo",
 "To" => "Iki",
@@ -95,6 +109,8 @@
 "Repeat" => "Kartoti",
 "Select weekdays" => "Pasirinkite savaitės dienas",
 "Select days" => "Pasirinkite dienas",
+"Select months" => "Pasirinkite mėnesius",
+"Select weeks" => "Pasirinkite savaites",
 "Interval" => "Intervalas",
 "End" => "Pabaiga",
 "Import a calendar file" => "Importuoti kalendoriaus failą",
@@ -106,11 +122,19 @@
 "Calendar imported successfully" => "Kalendorius sėkmingai importuotas",
 "Close Dialog" => "Uždaryti",
 "Create a new event" => "Sukurti naują įvykį",
+"View an event" => "Peržiūrėti įvykį",
+"No categories selected" => "Nepasirinktos jokios katagorijos",
 "Select category" => "Pasirinkite kategoriją",
 "Timezone" => "Laiko juosta",
 "Check always for changes of the timezone" => "Visada tikrinti laiko zonos pasikeitimus",
 "Timeformat" => "Laiko formatas",
 "24h" => "24val",
 "12h" => "12val",
-"Calendar CalDAV syncing address:" => "CalDAV kalendoriaus synchronizavimo adresas:"
+"Calendar CalDAV syncing address:" => "CalDAV kalendoriaus synchronizavimo adresas:",
+"Users" => "Vartotojai",
+"select users" => "pasirinkti vartotojus",
+"Editable" => "Redaguojamas",
+"Groups" => "Grupės",
+"select groups" => "pasirinkti grupes",
+"make public" => "viešinti"
 );
diff --git a/apps/calendar/l10n/nb_NO.php b/apps/calendar/l10n/nb_NO.php
index b9a7bf4cb1..95ba5a9dba 100644
--- a/apps/calendar/l10n/nb_NO.php
+++ b/apps/calendar/l10n/nb_NO.php
@@ -147,7 +147,7 @@
 "24h" => "24 t",
 "12h" => "12 t",
 "First day of the week" => "Ukens første dag",
-"Calendar CalDAV syncing address:" => "Kalender CalDAV synkroniseringsadresse",
+"Calendar CalDAV syncing address:" => "Synkroniseringsadresse fo kalender CalDAV:",
 "Users" => "Brukere",
 "select users" => "valgte brukere",
 "Editable" => "Redigerbar",
diff --git a/apps/calendar/l10n/pl.php b/apps/calendar/l10n/pl.php
index 520c67d424..e582cdbb9b 100644
--- a/apps/calendar/l10n/pl.php
+++ b/apps/calendar/l10n/pl.php
@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Brak kalendarzy",
+"No events found." => "Brak wydzarzeń",
 "Wrong calendar" => "Nieprawidłowy kalendarz",
 "New Timezone:" => "Nowa strefa czasowa:",
 "Timezone changed" => "Zmieniono strefę czasową",
 "Invalid request" => "Nieprawidłowe żądanie",
 "Calendar" => "Kalendarz",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "Urodziny",
 "Business" => "Interesy",
 "Call" => "Rozmowy",
@@ -19,6 +22,7 @@
 "Projects" => "Projekty",
 "Questions" => "Pytania",
 "Work" => "Zawodowe",
+"unnamed" => "nienazwany",
 "Does not repeat" => "Brak",
 "Daily" => "Codziennie",
 "Weekly" => "Tygodniowo",
@@ -80,10 +84,15 @@
 "Calendars" => "Kalendarze",
 "There was a fail, while parsing the file." => "Nie udało się przetworzyć pliku.",
 "Choose active calendars" => "Wybór aktywnych kalendarzy",
+"Your calendars" => "Twoje kalendarze",
 "CalDav Link" => "Wyświetla odnośnik CalDAV",
+"Shared calendars" => "Współdzielone kalendarze",
+"No shared calendars" => "Brak współdzielonych kalendarzy",
+"Share Calendar" => "Współdziel kalendarz",
 "Download" => "Pobiera kalendarz",
 "Edit" => "Edytuje kalendarz",
 "Delete" => "Usuwa kalendarz",
+"shared with you by" => "współdzielisz z",
 "New calendar" => "Nowy kalendarz",
 "Edit calendar" => "Edytowanie kalendarza",
 "Displayname" => "Wyświetlana nazwa",
@@ -94,8 +103,15 @@
 "Cancel" => "Anuluj",
 "Edit an event" => "Edytowanie wydarzenia",
 "Export" => "Wyeksportuj",
+"Eventinfo" => "Informacja o wydarzeniach",
+"Repeating" => "Powtarzanie",
+"Alarm" => "Alarm",
+"Attendees" => "Uczestnicy",
+"Share" => "Współdziel",
 "Title of the Event" => "Nazwa wydarzenia",
 "Category" => "Kategoria",
+"Separate categories with commas" => "Oddziel kategorie przecinkami",
+"Edit categories" => "Edytuj kategorie",
 "All Day Event" => "Wydarzenie całodniowe",
 "From" => "Od",
 "To" => "Do",
@@ -125,11 +141,22 @@
 "Calendar imported successfully" => "Zaimportowano kalendarz",
 "Close Dialog" => "Zamknij okno",
 "Create a new event" => "Tworzenie nowego wydarzenia",
+"View an event" => "Zobacz wydarzenie",
+"No categories selected" => "nie zaznaczono kategorii",
 "Select category" => "Wybierz kategorię",
+"of" => "z",
+"at" => "w",
 "Timezone" => "Strefa czasowa",
 "Check always for changes of the timezone" => "Zawsze sprawdzaj zmiany strefy czasowej",
 "Timeformat" => "Format czasu",
 "24h" => "24h",
 "12h" => "12h",
-"Calendar CalDAV syncing address:" => "Adres synchronizacji kalendarza CalDAV:"
+"First day of the week" => "Pierwszy dzień tygodnia",
+"Calendar CalDAV syncing address:" => "Adres synchronizacji kalendarza CalDAV:",
+"Users" => "Użytkownicy",
+"select users" => "wybierz użytkowników",
+"Editable" => "Edytowalne",
+"Groups" => "Grupy",
+"select groups" => "wybierz grupy",
+"make public" => "uczyń publicznym"
 );
diff --git a/apps/calendar/l10n/pt_PT.php b/apps/calendar/l10n/pt_PT.php
index 867a10a70b..33f85569cc 100644
--- a/apps/calendar/l10n/pt_PT.php
+++ b/apps/calendar/l10n/pt_PT.php
@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Nenhum calendário encontrado.",
+"No events found." => "Nenhum evento encontrado.",
 "Wrong calendar" => "Calendário errado",
 "New Timezone:" => "Nova zona horária",
 "Timezone changed" => "Zona horária alterada",
 "Invalid request" => "Pedido inválido",
 "Calendar" => "Calendário",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "Dia de anos",
 "Business" => "Negócio",
 "Call" => "Telefonar",
@@ -19,6 +22,7 @@
 "Projects" => "Projetos",
 "Questions" => "Perguntas",
 "Work" => "Trabalho",
+"unnamed" => "não definido",
 "Does not repeat" => "Não repete",
 "Daily" => "Diário",
 "Weekly" => "Semanal",
@@ -80,10 +84,15 @@
 "Calendars" => "Calendários",
 "There was a fail, while parsing the file." => "Houve uma falha durante a análise do ficheiro",
 "Choose active calendars" => "Escolhe calendários ativos",
+"Your calendars" => "Os seus calendários",
 "CalDav Link" => "Endereço CalDav",
+"Shared calendars" => "Calendários partilhados",
+"No shared calendars" => "Nenhum calendário partilhado",
+"Share Calendar" => "Partilhar calendário",
 "Download" => "Transferir",
 "Edit" => "Editar",
 "Delete" => "Apagar",
+"shared with you by" => "Partilhado consigo por",
 "New calendar" => "Novo calendário",
 "Edit calendar" => "Editar calendário",
 "Displayname" => "Nome de exibição",
@@ -94,8 +103,15 @@
 "Cancel" => "Cancelar",
 "Edit an event" => "Editar um evento",
 "Export" => "Exportar",
+"Eventinfo" => "Informação do evento",
+"Repeating" => "Repetição",
+"Alarm" => "Alarme",
+"Attendees" => "Participantes",
+"Share" => "Partilhar",
 "Title of the Event" => "Título do evento",
 "Category" => "Categoria",
+"Separate categories with commas" => "Separe categorias por virgulas",
+"Edit categories" => "Editar categorias",
 "All Day Event" => "Evento de dia inteiro",
 "From" => "De",
 "To" => "Para",
@@ -125,11 +141,22 @@
 "Calendar imported successfully" => "Calendário importado com sucesso",
 "Close Dialog" => "Fechar diálogo",
 "Create a new event" => "Criar novo evento",
+"View an event" => "Ver um evento",
+"No categories selected" => "Nenhuma categoria seleccionada",
 "Select category" => "Selecionar categoria",
+"of" => "de",
+"at" => "em",
 "Timezone" => "Zona horária",
 "Check always for changes of the timezone" => "Verificar sempre por alterações na zona horária",
 "Timeformat" => "Formato da hora",
 "24h" => "24h",
 "12h" => "12h",
-"Calendar CalDAV syncing address:" => "Endereço de sincronização CalDav do calendário"
+"First day of the week" => "Primeiro dia da semana",
+"Calendar CalDAV syncing address:" => "Endereço de sincronização CalDav do calendário",
+"Users" => "Utilizadores",
+"select users" => "Selecione utilizadores",
+"Editable" => "Editavel",
+"Groups" => "Grupos",
+"select groups" => "Selecione grupos",
+"make public" => "Tornar público"
 );
diff --git a/apps/calendar/l10n/ro.php b/apps/calendar/l10n/ro.php
index f2b7707186..550afcd102 100644
--- a/apps/calendar/l10n/ro.php
+++ b/apps/calendar/l10n/ro.php
@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Nici un calendar găsit.",
+"No events found." => "Nici un eveniment găsit.",
 "Wrong calendar" => "Calendar greșit",
 "New Timezone:" => "Fus orar nou:",
 "Timezone changed" => "Fus orar schimbat",
 "Invalid request" => "Cerere eronată",
 "Calendar" => "Calendar",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "LLL z[aaaa]{'&#8212;'[LLL] z aaaa}",
 "Birthday" => "Zi de naștere",
 "Business" => "Afaceri",
 "Call" => "Sună",
@@ -19,6 +22,7 @@
 "Projects" => "Proiecte",
 "Questions" => "Întrebări",
 "Work" => "Servici",
+"unnamed" => "fără nume",
 "Does not repeat" => "Nerepetabil",
 "Daily" => "Zilnic",
 "Weekly" => "Săptămânal",
@@ -80,10 +84,15 @@
 "Calendars" => "Calendare",
 "There was a fail, while parsing the file." => "A fost întâmpinată o eroare în procesarea fișierului",
 "Choose active calendars" => "Alege calendarele active",
+"Your calendars" => "Calendarele tale",
 "CalDav Link" => "Legătură CalDav",
+"Shared calendars" => "Calendare partajate",
+"No shared calendars" => "Nici un calendar partajat",
+"Share Calendar" => "Partajați calendarul",
 "Download" => "Descarcă",
 "Edit" => "Modifică",
 "Delete" => "Șterge",
+"shared with you by" => "Partajat cu tine de",
 "New calendar" => "Calendar nou",
 "Edit calendar" => "Modifică calendarul",
 "Displayname" => "Nume afișat",
@@ -94,8 +103,15 @@
 "Cancel" => "Anulează",
 "Edit an event" => "Modifică un eveniment",
 "Export" => "Exportă",
+"Eventinfo" => "Informații despre eveniment",
+"Repeating" => "Ciclic",
+"Alarm" => "Alarmă",
+"Attendees" => "Participanți",
+"Share" => "Partajează",
 "Title of the Event" => "Numele evenimentului",
 "Category" => "Categorie",
+"Separate categories with commas" => "Separă categoriile prin virgule",
+"Edit categories" => "Editează categorii",
 "All Day Event" => "Toată ziua",
 "From" => "De la",
 "To" => "Către",
@@ -125,11 +141,22 @@
 "Calendar imported successfully" => "Calendarul a fost importat cu succes",
 "Close Dialog" => "Închide",
 "Create a new event" => "Crează un eveniment nou",
+"View an event" => "Vizualizează un eveniment",
+"No categories selected" => "Nici o categorie selectată",
 "Select category" => "Selecteză categoria",
+"of" => "din",
+"at" => "la",
 "Timezone" => "Fus orar",
 "Check always for changes of the timezone" => "Verifică mereu pentru schimbări ale fusului orar",
 "Timeformat" => "Forma de afișare a orei",
 "24h" => "24h",
 "12h" => "12h",
-"Calendar CalDAV syncing address:" => "Adresa pentru sincronizarea calendarului CalDAV"
+"First day of the week" => "Prima zi a săptămînii",
+"Calendar CalDAV syncing address:" => "Adresa pentru sincronizarea calendarului CalDAV",
+"Users" => "Utilizatori",
+"select users" => "utilizatori selectați",
+"Editable" => "Editabil",
+"Groups" => "Grupuri",
+"select groups" => "grupuri selectate",
+"make public" => "fă public"
 );
diff --git a/apps/calendar/l10n/ru.php b/apps/calendar/l10n/ru.php
index ff33dd6663..af40b06b9f 100644
--- a/apps/calendar/l10n/ru.php
+++ b/apps/calendar/l10n/ru.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Календари не найдены.",
+"No events found." => "События не найдены.",
 "Wrong calendar" => "Неверный календарь",
 "New Timezone:" => "Новый часовой пояс:",
 "Timezone changed" => "Часовой пояс изменён",
@@ -19,6 +21,7 @@
 "Projects" => "Проекты",
 "Questions" => "Вопросы",
 "Work" => "Работа",
+"unnamed" => "без имени",
 "Does not repeat" => "Не повторяется",
 "Daily" => "Ежедневно",
 "Weekly" => "Еженедельно",
@@ -80,10 +83,15 @@
 "Calendars" => "Календари",
 "There was a fail, while parsing the file." => "Не удалось обработать файл.",
 "Choose active calendars" => "Выберите активные календари",
+"Your calendars" => "Ваши календари",
 "CalDav Link" => "Ссылка для CalDav",
+"Shared calendars" => "Общие календари",
+"No shared calendars" => "Нет общих календарей",
+"Share Calendar" => "Сделать календарь общим",
 "Download" => "Скачать",
 "Edit" => "Редактировать",
 "Delete" => "Удалить",
+"shared with you by" => "с вами поделился",
 "New calendar" => "Новый календарь",
 "Edit calendar" => "Редактировать календарь",
 "Displayname" => "Отображаемое имя",
@@ -94,8 +102,15 @@
 "Cancel" => "Отмена",
 "Edit an event" => "Редактировать событие",
 "Export" => "Экспортировать",
+"Eventinfo" => "Информация о событии",
+"Repeating" => "Повторение",
+"Alarm" => "Сигнал",
+"Attendees" => "Участники",
+"Share" => "Поделиться",
 "Title of the Event" => "Название событие",
 "Category" => "Категория",
+"Separate categories with commas" => "Разделяйте категории запятыми",
+"Edit categories" => "Редактировать категории",
 "All Day Event" => "Событие на весь день",
 "From" => "От",
 "To" => "До",
@@ -125,11 +140,20 @@
 "Calendar imported successfully" => "Календарь успешно импортирован",
 "Close Dialog" => "Закрыть Сообщение",
 "Create a new event" => "Создать новое событие",
+"View an event" => "Показать событие",
+"No categories selected" => "Категории не выбраны",
 "Select category" => "Выбрать категорию",
 "Timezone" => "Часовой пояс",
 "Check always for changes of the timezone" => "Всегда проверяйте изменение часового пояса",
 "Timeformat" => "Формат времени",
 "24h" => "24ч",
 "12h" => "12ч",
-"Calendar CalDAV syncing address:" => "Адрес синхронизации календаря CalDAV:"
+"First day of the week" => "Первый день недели",
+"Calendar CalDAV syncing address:" => "Адрес синхронизации календаря CalDAV:",
+"Users" => "Пользователи",
+"select users" => "выбрать пользователей",
+"Editable" => "Редактируемо",
+"Groups" => "Группы",
+"select groups" => "выбрать группы",
+"make public" => "селать публичным"
 );
diff --git a/apps/calendar/l10n/sv.php b/apps/calendar/l10n/sv.php
index ee19c6b737..59f8c6e6b5 100644
--- a/apps/calendar/l10n/sv.php
+++ b/apps/calendar/l10n/sv.php
@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Inga kalendrar funna",
+"No events found." => "Inga händelser funna.",
 "Wrong calendar" => "Fel kalender",
 "New Timezone:" => "Ny tidszon:",
 "Timezone changed" => "Tidszon ändrad",
 "Invalid request" => "Ogiltig begäran",
 "Calendar" => "Kalender",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "Födelsedag",
 "Business" => "Företag",
 "Call" => "Ringa",
@@ -19,6 +22,7 @@
 "Projects" => "Projekt",
 "Questions" => "Frågor",
 "Work" => "Arbetet",
+"unnamed" => "Namn saknas",
 "Does not repeat" => "Upprepas inte",
 "Daily" => "Dagligen",
 "Weekly" => "Varje vecka",
@@ -80,10 +84,15 @@
 "Calendars" => "Kalendrar",
 "There was a fail, while parsing the file." => "Det blev ett fel medan filen analyserades.",
 "Choose active calendars" => "Välj aktiva kalendrar",
+"Your calendars" => "Dina kalendrar",
 "CalDav Link" => "CalDAV-länk",
+"Shared calendars" => "Delade kalendrar",
+"No shared calendars" => "Inga delade kalendrar",
+"Share Calendar" => "Dela kalender",
 "Download" => "Ladda ner",
 "Edit" => "Redigera",
 "Delete" => "Radera",
+"shared with you by" => "delad med dig av",
 "New calendar" => "Nya kalender",
 "Edit calendar" => "Redigera kalender",
 "Displayname" => "Visningsnamn",
@@ -94,8 +103,15 @@
 "Cancel" => "Avbryt",
 "Edit an event" => "Redigera en händelse",
 "Export" => "Exportera",
+"Eventinfo" => "Händelseinfo",
+"Repeating" => "Repetera",
+"Alarm" => "Alarm",
+"Attendees" => "Deltagare",
+"Share" => "Dela",
 "Title of the Event" => "Rubrik för händelsen",
 "Category" => "Kategori",
+"Separate categories with commas" => "Separera kategorier med komman",
+"Edit categories" => "Redigera kategorier",
 "All Day Event" => "Hela dagen",
 "From" => "Från",
 "To" => "Till",
@@ -125,11 +141,22 @@
 "Calendar imported successfully" => "Kalender importerades utan problem",
 "Close Dialog" => "Stäng ",
 "Create a new event" => "Skapa en ny händelse",
+"View an event" => "Visa en händelse",
+"No categories selected" => "Inga kategorier valda",
 "Select category" => "Välj kategori",
+"of" => "av",
+"at" => "på",
 "Timezone" => "Tidszon",
 "Check always for changes of the timezone" => "Kontrollera alltid ändringar i tidszon.",
 "Timeformat" => "Tidsformat",
 "24h" => "24h",
 "12h" => "12h",
-"Calendar CalDAV syncing address:" => "Synkroniseringsadress för CalDAV kalender:"
+"First day of the week" => "Första dagen av veckan",
+"Calendar CalDAV syncing address:" => "Synkroniseringsadress för CalDAV kalender:",
+"Users" => "Användare",
+"select users" => "välj användare",
+"Editable" => "Redigerbar",
+"Groups" => "Grupper",
+"select groups" => "Välj grupper",
+"make public" => "Gör offentlig"
 );
diff --git a/apps/calendar/l10n/zh_CN.php b/apps/calendar/l10n/zh_CN.php
index 129aa8d8e8..bb7e0a2872 100644
--- a/apps/calendar/l10n/zh_CN.php
+++ b/apps/calendar/l10n/zh_CN.php
@@ -6,6 +6,7 @@
 "Timezone changed" => "时区已修改",
 "Invalid request" => "非法请求",
 "Calendar" => "日历",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "生日",
 "Business" => "商务",
 "Call" => "呼叫",
@@ -104,6 +105,7 @@
 "Export" => "导出",
 "Eventinfo" => "事件信息",
 "Repeating" => "重复",
+"Alarm" => "提醒",
 "Attendees" => "参加者",
 "Share" => "共享",
 "Title of the Event" => "事件标题",
@@ -142,6 +144,8 @@
 "View an event" => "查看事件",
 "No categories selected" => "无选中分类",
 "Select category" => "选择分类",
+"of" => "在",
+"at" => "在",
 "Timezone" => "时区",
 "Check always for changes of the timezone" => "选中则总是按照时区变化",
 "Timeformat" => "时间格式",
diff --git a/apps/calendar/l10n/zh_TW.php b/apps/calendar/l10n/zh_TW.php
index b4f1d4e9b8..746594462c 100644
--- a/apps/calendar/l10n/zh_TW.php
+++ b/apps/calendar/l10n/zh_TW.php
@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "沒有找到行事曆",
+"No events found." => "沒有找到活動",
 "Wrong calendar" => "錯誤日曆",
 "New Timezone:" => "新時區：",
 "Timezone changed" => "時區已變更",
 "Invalid request" => "無效請求",
 "Calendar" => "日曆",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "生日",
 "Business" => "商業",
 "Call" => "呼叫",
@@ -19,6 +22,7 @@
 "Projects" => "計畫",
 "Questions" => "問題",
 "Work" => "工作",
+"unnamed" => "無名稱的",
 "Does not repeat" => "不重覆",
 "Daily" => "每日",
 "Weekly" => "每週",
@@ -29,6 +33,7 @@
 "never" => "絕不",
 "by occurrences" => "由事件",
 "by date" => "由日期",
+"by monthday" => "依月份日期",
 "by weekday" => "由平日",
 "Monday" => "週一",
 "Tuesday" => "週二",
@@ -37,6 +42,7 @@
 "Friday" => "週五",
 "Saturday" => "週六",
 "Sunday" => "週日",
+"events week of month" => "月份中活動週",
 "first" => "第一",
 "second" => "第二",
 "third" => "第三",
@@ -56,9 +62,11 @@
 "November" => "十一月",
 "December" => "十二月",
 "by events date" => "由事件日期",
+"by yearday(s)" => "依年份日期",
 "by weeknumber(s)" => "由週數",
 "by day and month" => "由日與月",
 "Date" => "日期",
+"Cal." => "行事曆",
 "All day" => "整天",
 "New Calendar" => "新日曆",
 "Missing fields" => "遺失欄位",
@@ -76,10 +84,15 @@
 "Calendars" => "日曆",
 "There was a fail, while parsing the file." => "解析檔案時失敗。",
 "Choose active calendars" => "選擇一個作用中的日曆",
+"Your calendars" => "你的行事曆",
 "CalDav Link" => "CalDav 聯結",
+"Shared calendars" => "分享的行事曆",
+"No shared calendars" => "不分享的行事曆",
+"Share Calendar" => "分享行事曆",
 "Download" => "下載",
 "Edit" => "編輯",
 "Delete" => "刪除",
+"shared with you by" => "分享給你由",
 "New calendar" => "新日曆",
 "Edit calendar" => "編輯日曆",
 "Displayname" => "顯示名稱",
@@ -90,11 +103,15 @@
 "Cancel" => "取消",
 "Edit an event" => "編輯事件",
 "Export" => "匯出",
+"Eventinfo" => "活動資訊",
+"Repeating" => "重覆中",
 "Alarm" => "鬧鐘",
 "Attendees" => "出席者",
 "Share" => "分享",
 "Title of the Event" => "事件標題",
 "Category" => "分類",
+"Separate categories with commas" => "用逗點分隔分類",
+"Edit categories" => "編輯分類",
 "All Day Event" => "全天事件",
 "From" => "自",
 "To" => "至",
@@ -107,8 +124,11 @@
 "Advanced" => "進階",
 "Select weekdays" => "選擇平日",
 "Select days" => "選擇日",
+"and the events day of year." => "以及年中的活動日",
+"and the events day of month." => "以及月中的活動日",
 "Select months" => "選擇月",
 "Select weeks" => "選擇週",
+"and the events week of year." => "以及年中的活動週",
 "Interval" => "間隔",
 "End" => "結束",
 "occurrences" => "事件",
@@ -121,16 +141,22 @@
 "Calendar imported successfully" => "已成功匯入日曆",
 "Close Dialog" => "關閉對話",
 "Create a new event" => "建立一個新事件",
+"View an event" => "觀看一個活動",
+"No categories selected" => "沒有選擇分類",
 "Select category" => "選擇分類",
+"of" => "於",
+"at" => "於",
 "Timezone" => "時區",
 "Check always for changes of the timezone" => "總是檢查是否變更了時區",
 "Timeformat" => "日期格式",
 "24h" => "24小時制",
 "12h" => "12小時制",
+"First day of the week" => "每週的第一天",
 "Calendar CalDAV syncing address:" => "CalDAV 的日曆同步地址：",
 "Users" => "使用者",
 "select users" => "選擇使用者",
 "Editable" => "可編輯",
 "Groups" => "群組",
-"select groups" => "選擇群組"
+"select groups" => "選擇群組",
+"make public" => "公開"
 );
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index f0a9bf050f..cc80a0bb70 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -600,8 +600,8 @@ class OC_Calendar_Object{
 
 	public static function updateVCalendarFromRequest($request, $vcalendar)
 	{
-		$title = $request["title"];
-		$location = $request["location"];
+		$title = strip_tags($request["title"]);
+		$location = strip_tags($request["location"]);
 		$categories = $request["categories"];
 		$allday = isset($request["allday"]);
 		$from = $request["from"];
@@ -611,7 +611,7 @@ class OC_Calendar_Object{
 			$totime = $request['totime'];
 		}
 		$vevent = $vcalendar->VEVENT;
-		$description = $request["description"];
+		$description = strip_tags($request["description"]);
 		$repeat = $request["repeat"];
 		if($repeat != 'doesnotrepeat'){
 			$rrule = '';
diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php
index e93ea1af4c..39cda29c20 100644
--- a/apps/calendar/templates/part.import.php
+++ b/apps/calendar/templates/part.import.php
@@ -2,7 +2,7 @@
 <div id="form_container">
 <input type="hidden" id="filename" value="<?php echo $_['filename'];?>">
 <input type="hidden" id="path" value="<?php echo $_['path'];?>">
-<input type="hidden" id="progressfile" value="<?php echo md5(session_id()) . '.txt';?>">
+<input type="hidden" id="progresskey" value="<?php echo rand() ?>">
 <p style="text-align:center;"><b><?php echo $l->t('Please choose the calendar'); ?></b></p>
 <select style="width:100%;" id="calendar" name="calendar">
 <?php
diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/addcontact.php
index ee451098f1..af9b2bbcc0 100644
--- a/apps/contacts/ajax/addcontact.php
+++ b/apps/contacts/ajax/addcontact.php
@@ -20,25 +20,10 @@
  *
  */
 
-// Init owncloud
- 
-function bailOut($msg) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	OCP\Util::writeLog('contacts','ajax/addcontact.php: '.$msg, OCP\Util::DEBUG);
-	exit();
-}
-function debug($msg) {
-	OCP\Util::writeLog('contacts','ajax/addcontact.php: '.$msg, OCP\Util::DEBUG);
-}
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-foreach ($_POST as $key=>$element) {
-	debug('_POST: '.$key.'=>'.$element);
-}
-
 $aid = isset($_POST['aid'])?$_POST['aid']:null;
 if(!$aid) {
 	$aid = min(OC_Contacts_Addressbook::activeIds()); // first active addressbook.
@@ -54,7 +39,7 @@ $vcard->setUID();
 $vcard->setString('FN',$fn);
 $vcard->setString('N',$n);
 
-$id = OC_Contacts_VCard::add($aid,$vcard, null, $isnew);
+$id = OC_Contacts_VCard::add($aid, $vcard, null, $isnew);
 if(!$id) {
 	OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('There was an error adding the contact.'))));
 	OCP\Util::writeLog('contacts','ajax/addcontact.php: Recieved non-positive ID on adding card: '.$id, OCP\Util::ERROR);
diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index bf23df6758..4668c0d3a6 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -20,9 +20,6 @@
  *
  */
 
-// Init owncloud
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
diff --git a/apps/contacts/ajax/contactdetails.php b/apps/contacts/ajax/contactdetails.php
index 657dc5d586..a6ca10f9c9 100644
--- a/apps/contacts/ajax/contactdetails.php
+++ b/apps/contacts/ajax/contactdetails.php
@@ -19,8 +19,6 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
-// Init owncloud
  
 function bailOut($msg) {
 	OCP\JSON::error(array('data' => array('message' => $msg)));
@@ -42,18 +40,6 @@ if(is_null($vcard)) {
 }
 $details = OC_Contacts_VCard::structureContact($vcard);
 
-// Some Google exported files have no FN field.
-/*if(!isset($details['FN'])) {
-	$fn = '';
-	if(isset($details['N'])) {
-		$details['FN'] = array(implode(' ', $details['N'][0]['value']));
-	} elseif(isset($details['EMAIL'])) {
-		$details['FN'] = array('value' => $details['EMAIL'][0]['value']);
-	} else {
-		$details['FN'] = array('value' => OC_Contacts_App::$l10n->t('Unknown'));
-	}
-}*/
-
 // Make up for not supporting the 'N' field in earlier version.
 if(!isset($details['N'])) {
 	$details['N'] = array();
diff --git a/apps/contacts/ajax/cropphoto.php b/apps/contacts/ajax/cropphoto.php
index 7b286dbdb5..caba7c8c4e 100644
--- a/apps/contacts/ajax/cropphoto.php
+++ b/apps/contacts/ajax/cropphoto.php
@@ -20,18 +20,14 @@
  *
  */
 
-// Init owncloud
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-$tmp_path = $_GET['tmp_path'];
+$tmpkey = $_GET['tmpkey'];
 $id = $_GET['id'];
-OCP\Util::writeLog('contacts','ajax/cropphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OCP\Util::DEBUG);
 $tmpl = new OCP\Template("contacts", "part.cropphoto");
-$tmpl->assign('tmp_path', $tmp_path);
+$tmpl->assign('tmpkey', $tmpkey);
 $tmpl->assign('id', $id);
 $page = $tmpl->fetchPage();
 
diff --git a/apps/contacts/ajax/currentphoto.php b/apps/contacts/ajax/currentphoto.php
index d0654b17d6..5f90128f32 100644
--- a/apps/contacts/ajax/currentphoto.php
+++ b/apps/contacts/ajax/currentphoto.php
@@ -19,10 +19,7 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-// Init owncloud
-//require_once('../../../lib/base.php');
 
-// Check if we are a user
 // Firefox and Konqueror tries to download application/json for me.  --Arthur
 OCP\JSON::setContentTypeHeader('text/plain');
 OCP\JSON::checkLoggedIn();
@@ -32,30 +29,24 @@ function bailOut($msg) {
 	OCP\Util::writeLog('contacts','ajax/currentphoto.php: '.$msg, OCP\Util::ERROR);
 	exit();
 }
-function debug($msg) {
-	OCP\Util::writeLog('contacts','ajax/currentphoto.php: '.$msg, OCP\Util::DEBUG);
-}
 
 if (!isset($_GET['id'])) {
 	bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
 }
 
-$tmpfname = tempnam(get_temp_dir(), "occOrig");
 $contact = OC_Contacts_App::getContactVCard($_GET['id']);
-$image = new OC_Image();
-if(!$image) {
-	bailOut(OC_Contacts_App::$l10n->t('Error loading image.'));
-}
 // invalid vcard
 if( is_null($contact)) {
 	bailOut(OC_Contacts_App::$l10n->t('Error reading contact photo.'));
 } else {
+	$image = new OC_Image();
 	if(!$image->loadFromBase64($contact->getAsString('PHOTO'))) {
 		$image->loadFromBase64($contact->getAsString('LOGO'));
 	}
 	if($image->valid()) {
-		if($image->save($tmpfname)) {
-			OCP\JSON::success(array('data' => array('id'=>$_GET['id'], 'tmp'=>$tmpfname)));
+		$tmpkey = 'contact-photo-'.$contact->getAsString('UID');
+		if(OC_Cache::set($tmpkey, $image->data(), 600)) {
+			OCP\JSON::success(array('data' => array('id'=>$_GET['id'], 'tmp'=>$tmpkey)));
 			exit();
 		} else {
 			bailOut(OC_Contacts_App::$l10n->t('Error saving temporary file.'));
diff --git a/apps/contacts/ajax/deletebook.php b/apps/contacts/ajax/deletebook.php
index bcf6aa4432..fe582daa00 100644
--- a/apps/contacts/ajax/deletebook.php
+++ b/apps/contacts/ajax/deletebook.php
@@ -20,9 +20,6 @@
  *
  */
 
-// Init owncloud
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
diff --git a/apps/contacts/ajax/deletecard.php b/apps/contacts/ajax/deletecard.php
index 46fd8252d4..6414fda93c 100644
--- a/apps/contacts/ajax/deletecard.php
+++ b/apps/contacts/ajax/deletecard.php
@@ -25,9 +25,6 @@ function bailOut($msg) {
 	exit();
 }
 
-// Init owncloud
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
diff --git a/apps/contacts/ajax/deleteproperty.php b/apps/contacts/ajax/deleteproperty.php
index 9bb1208cdd..b0746d18a7 100644
--- a/apps/contacts/ajax/deleteproperty.php
+++ b/apps/contacts/ajax/deleteproperty.php
@@ -20,9 +20,6 @@
  *
  */
 
-// Init owncloud
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php
index 9ba280ae54..d06d416b7e 100644
--- a/apps/contacts/ajax/editname.php
+++ b/apps/contacts/ajax/editname.php
@@ -14,14 +14,11 @@ function bailOut($msg) {
 	OCP\Util::writeLog('contacts','ajax/editname.php: '.$msg, OCP\Util::DEBUG);
 	exit();
 }
-function debug($msg) {
-	OCP\Util::writeLog('contacts','ajax/editname.php: '.$msg, OCP\Util::DEBUG);
-}
 
 $tmpl = new OCP\Template("contacts", "part.edit_name_dialog");
 
 $id = isset($_GET['id'])?$_GET['id']:'';
-debug('id: '.$id);
+
 if($id) {
 	$vcard = OC_Contacts_App::getContactVCard($id);
 	$name = array('', '', '', '', '');
diff --git a/apps/contacts/ajax/loadcard.php b/apps/contacts/ajax/loadcard.php
index 4e6f2206fe..fbb831f4a1 100644
--- a/apps/contacts/ajax/loadcard.php
+++ b/apps/contacts/ajax/loadcard.php
@@ -20,20 +20,6 @@
  *
  */
 
-// Init owncloud
- 
-function bailOut($msg) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	OCP\Util::writeLog('contacts','ajax/loadcard.php: '.$msg, OCP\Util::DEBUG);
-	exit();
-}
-function debug($msg) {
-	OCP\Util::writeLog('contacts','ajax/loadcard.php: '.$msg, OCP\Util::DEBUG);
-}
-// foreach ($_POST as $key=>$element) {
-// 	debug('_POST: '.$key.'=>'.$element);
-// }
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
diff --git a/apps/contacts/ajax/loadphoto.php b/apps/contacts/ajax/loadphoto.php
index ef429e8289..eac7ca7d02 100644
--- a/apps/contacts/ajax/loadphoto.php
+++ b/apps/contacts/ajax/loadphoto.php
@@ -19,24 +19,17 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-// Init owncloud
  
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-// foreach ($_POST as $key=>$element) {
-// 	OCP\Util::writeLog('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OCP\Util::DEBUG);
-// }
-
 function bailOut($msg) {
 	OCP\JSON::error(array('data' => array('message' => $msg)));
 	OCP\Util::writeLog('contacts','ajax/loadphoto.php: '.$msg, OCP\Util::DEBUG);
 	exit();
 }
 
-$image = null;
-
 $id = isset($_GET['id']) ? $_GET['id'] : '';
 $refresh = isset($_GET['refresh']) ? true : false;
 
diff --git a/apps/contacts/ajax/oc_photo.php b/apps/contacts/ajax/oc_photo.php
index 184217f2b7..ea25ebf176 100644
--- a/apps/contacts/ajax/oc_photo.php
+++ b/apps/contacts/ajax/oc_photo.php
@@ -20,8 +20,6 @@
  *
  */
 // Check if we are a user
-// Firefox and Konqueror tries to download application/json for me.  --Arthur
-OCP\JSON::setContentTypeHeader('text/plain');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 function bailOut($msg) {
@@ -29,9 +27,6 @@ function bailOut($msg) {
 	OCP\Util::writeLog('contacts','ajax/oc_photo.php: '.$msg, OCP\Util::ERROR);
 	exit();
 }
-function debug($msg) {
-	OCP\Util::writeLog('contacts','ajax/oc_photo.php: '.$msg, OCP\Util::DEBUG);
-}
 
 if(!isset($_GET['id'])) {
 	bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
@@ -42,31 +37,30 @@ if(!isset($_GET['path'])) {
 }
 
 $localpath = OC_Filesystem::getLocalFile($_GET['path']);
-$tmpfname = tempnam(get_temp_dir(), "occOrig");
+$tmpkey = 'contact-photo-'.$_GET['id'];
 
 if(!file_exists($localpath)) {
 	bailOut(OC_Contacts_App::$l10n->t('File doesn\'t exist:').$localpath);
 }
-file_put_contents($tmpfname, file_get_contents($localpath));
 
 $image = new OC_Image();
 if(!$image) {
 	bailOut(OC_Contacts_App::$l10n->t('Error loading image.'));
 }
-if(!$image->loadFromFile($tmpfname)) {
+if(!$image->loadFromFile($localpath)) {
 	bailOut(OC_Contacts_App::$l10n->t('Error loading image.'));
 }
 if($image->width() > 400 || $image->height() > 400) {
 	$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
 }
 if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
-	debug('Couldn\'t save correct image orientation: '.$tmpfname);
+	OCP\Util::writeLog('contacts','ajax/oc_photo.php: Couldn\'t save correct image orientation: '.$localpath, OCP\Util::DEBUG);
 }
-if($image->save($tmpfname)) {
-	OCP\JSON::success(array('data' => array('id'=>$_GET['id'], 'tmp'=>$tmpfname)));
+if(OC_Cache::set($tmpkey, $image->data(), 600)) {
+	OCP\JSON::success(array('data' => array('id'=>$_GET['id'], 'tmp'=>$tmpkey)));
 	exit();
 } else {
-	bailOut('Couldn\'t save temporary image: '.$tmpfname);
+	bailOut('Couldn\'t save temporary image: '.$tmpkey);
 }
 
 ?>
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
index fe9e5c5b99..b3aab6a881 100644
--- a/apps/contacts/ajax/savecrop.php
+++ b/apps/contacts/ajax/savecrop.php
@@ -18,21 +18,11 @@
  * 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/>.
  *
- * TODO: Translatable strings.
- *       Remember to delete tmp file at some point.
  */
-// Init owncloud
- 
-OCP\Util::writeLog('contacts','ajax/savecrop.php: Huzzah!!!', OCP\Util::DEBUG);
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-// foreach ($_POST as $key=>$element) {
-// 	OCP\Util::writeLog('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OCP\Util::DEBUG);
-// }
-
 // Firefox and Konqueror tries to download application/json for me.  --Arthur
 OCP\JSON::setContentTypeHeader('text/plain');
 
@@ -50,88 +40,71 @@ $y1 = (isset($_POST['y1']) && $_POST['y1']) ? $_POST['y1'] : 0;
 //$y2 = isset($_POST['y2']) ? $_POST['y2'] : -1;
 $w = (isset($_POST['w']) && $_POST['w']) ? $_POST['w'] : -1;
 $h = (isset($_POST['h']) && $_POST['h']) ? $_POST['h'] : -1;
-$tmp_path = isset($_POST['tmp_path']) ? $_POST['tmp_path'] : '';
+$tmpkey = isset($_POST['tmpkey']) ? $_POST['tmpkey'] : '';
 $id = isset($_POST['id']) ? $_POST['id'] : '';
 
-if($tmp_path == '') {
-	bailOut('Missing path to temporary file.');
+if($tmpkey == '') {
+	bailOut('Missing key to temporary file.');
 }
 
 if($id == '') {
 	bailOut('Missing contact id.');
 }
 
-OCP\Util::writeLog('contacts','savecrop.php: files: '.$tmp_path.'  exists: '.file_exists($tmp_path), OCP\Util::DEBUG);
+OCP\Util::writeLog('contacts','savecrop.php: key: '.$tmpkey, OCP\Util::DEBUG);
 
-if(file_exists($tmp_path)) {
+$data = OC_Cache::get($tmpkey);
+if($data) {
 	$image = new OC_Image();
-	if($image->loadFromFile($tmp_path)) {
+	if($image->loadFromdata($data)) {
 		$w = ($w != -1 ? $w : $image->width());
 		$h = ($h != -1 ? $h : $image->height());
 		OCP\Util::writeLog('contacts','savecrop.php, x: '.$x1.' y: '.$y1.' w: '.$w.' h: '.$h, OCP\Util::DEBUG);
 		if($image->crop($x1, $y1, $w, $h)) {
 			if(($image->width() <= 200 && $image->height() <= 200) || $image->resize(200)) {
-				$tmpfname = tempnam(get_temp_dir(), "occCropped"); // create a new file because of caching issues.
-				if($image->save($tmpfname)) {
-					unlink($tmp_path);
-					$card = OC_Contacts_App::getContactVCard($id);
-					if(!$card) {
-						unlink($tmpfname);
-						bailOut('Error getting contact object.');
-					}
-					if($card->__isset('PHOTO')) {
-						OCP\Util::writeLog('contacts','savecrop.php: PHOTO property exists.', OCP\Util::DEBUG);
-						$property = $card->__get('PHOTO');
-						if(!$property) {
-							unlink($tmpfname);
-							bailOut('Error getting PHOTO property.');
-						}
-						$property->setValue($image->__toString());
-						$property->parameters[] = new Sabre_VObject_Parameter('ENCODING', 'b');
-						$property->parameters[] = new Sabre_VObject_Parameter('TYPE', $image->mimeType());
-						$card->__set('PHOTO', $property);
-					} else {
-						OCP\Util::writeLog('contacts','savecrop.php: files: Adding PHOTO property.', OCP\Util::DEBUG);
-						$card->addProperty('PHOTO', $image->__toString(), array('ENCODING' => 'b', 'TYPE' => $image->mimeType()));
-					}
-					$now = new DateTime;
-					$card->setString('REV', $now->format(DateTime::W3C));
-					if(!OC_Contacts_VCard::edit($id,$card)) {
-						bailOut('Error saving contact.');
-					}
-					unlink($tmpfname);
-					//$result=array( "status" => "success", 'mime'=>$image->mimeType(), 'tmp'=>$tmp_path);
-					$tmpl = new OCP\Template("contacts", "part.contactphoto");
-					$tmpl->assign('tmp_path', $tmpfname);
-					$tmpl->assign('mime', $image->mimeType());
-					$tmpl->assign('id', $id);
-					$tmpl->assign('refresh', true);
-					$tmpl->assign('width', $image->width());
-					$tmpl->assign('height', $image->height());
-					$page = $tmpl->fetchPage();
-					OCP\JSON::success(array('data' => array('page'=>$page, 'tmp'=>$tmpfname)));
-					exit();
-				} else {
-					if(file_exists($tmpfname)) {
-						unlink($tmpfname);
-					}
-					bailOut('Error saving temporary image');
+				$card = OC_Contacts_App::getContactVCard($id);
+				if(!$card) {
+					OC_Cache::remove($tmpkey);
+					bailOut(OC_Contacts_App::$l10n->t('Error getting contact object.'));
 				}
+				if($card->__isset('PHOTO')) {
+					OCP\Util::writeLog('contacts','savecrop.php: PHOTO property exists.', OCP\Util::DEBUG);
+					$property = $card->__get('PHOTO');
+					if(!$property) {
+						OC_Cache::remove($tmpkey);
+						bailOut(OC_Contacts_App::$l10n->t('Error getting PHOTO property.'));
+					}
+					$property->setValue($image->__toString());
+					$property->parameters[] = new Sabre_VObject_Parameter('ENCODING', 'b');
+					$property->parameters[] = new Sabre_VObject_Parameter('TYPE', $image->mimeType());
+					$card->__set('PHOTO', $property);
+				} else {
+					OCP\Util::writeLog('contacts','savecrop.php: files: Adding PHOTO property.', OCP\Util::DEBUG);
+					$card->addProperty('PHOTO', $image->__toString(), array('ENCODING' => 'b', 'TYPE' => $image->mimeType()));
+				}
+				$now = new DateTime;
+				$card->setString('REV', $now->format(DateTime::W3C));
+				if(!OC_Contacts_VCard::edit($id,$card)) {
+					bailOut(OC_Contacts_App::$l10n->t('Error saving contact.'));
+				}
+				$tmpl = new OCP\Template("contacts", "part.contactphoto");
+				$tmpl->assign('id', $id);
+				$tmpl->assign('refresh', true);
+				$tmpl->assign('width', $image->width());
+				$tmpl->assign('height', $image->height());
+				$page = $tmpl->fetchPage();
+				OCP\JSON::success(array('data' => array('page'=>$page)));
 			} else {
-				bailOut('Error resizing image');
+				bailOut(OC_Contacts_App::$l10n->t('Error resizing image'));
 			}
 		} else {
-			bailOut('Error cropping image');
+			bailOut(OC_Contacts_App::$l10n->t('Error cropping image'));
 		}
 	} else {
-		bailOut('Error creating temporary image');
+		bailOut(OC_Contacts_App::$l10n->t('Error creating temporary image'));
 	}
 } else {
-	bailOut('Error finding image: '.$tmp_path);
+	bailOut(OC_Contacts_App::$l10n->t('Error finding image: ').$tmpkey);
 }
 
-if($tmp_path != '' && file_exists($tmp_path)) {
-	unlink($tmp_path);
-}
-
-?>
+OC_Cache::remove($tmpkey);
diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index 6509ac21f2..8409ffe47f 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -20,9 +20,6 @@
  *
  */
 
-// Init owncloud
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
@@ -35,21 +32,12 @@ function bailOut($msg) {
 function debug($msg) {
 	OCP\Util::writeLog('contacts','ajax/saveproperty.php: '.$msg, OCP\Util::DEBUG);
 }
-// foreach ($_POST as $key=>$element) {
-// 	debug('_POST: '.$key.'=>'.print_r($element, true));
-// }
 
 $id = isset($_POST['id'])?$_POST['id']:null;
 $name = isset($_POST['name'])?$_POST['name']:null;
 $value = isset($_POST['value'])?$_POST['value']:null;
 $parameters = isset($_POST['parameters'])?$_POST['parameters']:null;
 $checksum = isset($_POST['checksum'])?$_POST['checksum']:null;
-// if(!is_null($parameters)) {
-// 	debug('parameters: '.count($parameters));
-// 	foreach($parameters as $key=>$val ) {
-// 		debug('parameter: '.$key.'=>'.implode('/',$val));
-// 	}
-// }
 
 if(!$name) {
 	bailOut(OC_Contacts_App::$l10n->t('element name is not set.'));
diff --git a/apps/contacts/ajax/uploadimport.php b/apps/contacts/ajax/uploadimport.php
index b11f380fa8..463ca161e5 100644
--- a/apps/contacts/ajax/uploadimport.php
+++ b/apps/contacts/ajax/uploadimport.php
@@ -28,9 +28,6 @@ function bailOut($msg) {
 	OCP\Util::writeLog('contacts','ajax/uploadimport.php: '.$msg, OCP\Util::ERROR);
 	exit();
 }
-function debug($msg) {
-	OCP\Util::writeLog('contacts','ajax/uploadimport.php: '.$msg, OCP\Util::DEBUG);
-}
 
 $view = OCP\Files::getStorage('contacts');
 $tmpfile = md5(rand());
@@ -39,7 +36,6 @@ $tmpfile = md5(rand());
 $fn = (isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : false);
 if($fn) {
 	if($view->file_put_contents('/'.$tmpfile, file_get_contents('php://input'))) {
-		debug($fn.' uploaded');
 		OCP\JSON::success(array('data' => array('path'=>'', 'file'=>$tmpfile)));
 		exit();
 	} else {
@@ -70,7 +66,6 @@ $file=$_FILES['importfile'];
 $tmpfname = tempnam(get_temp_dir(), "occOrig");
 if(file_exists($file['tmp_name'])) {
 	if($view->file_put_contents('/'.$tmpfile, file_get_contents($file['tmp_name']))) {
-		debug($fn.' uploaded');
 		OCP\JSON::success(array('data' => array('path'=>'', 'file'=>$tmpfile)));
 	} else {
 		bailOut(OC_Contacts_App::$l10n->t('Error uploading contacts to storage.'));
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
index dca8ede6d6..09c4e55d4a 100644
--- a/apps/contacts/ajax/uploadphoto.php
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -19,14 +19,12 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-// Init owncloud
- 
 
 // Check if we are a user
-// Firefox and Konqueror tries to download application/json for me.  --Arthur
-OCP\JSON::setContentTypeHeader('text/plain');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+// Firefox and Konqueror tries to download application/json for me.  --Arthur
+OCP\JSON::setContentTypeHeader('text/plain');
 function bailOut($msg) {
 	OCP\JSON::error(array('data' => array('message' => $msg)));
 	OCP\Util::writeLog('contacts','ajax/uploadphoto.php: '.$msg, OCP\Util::DEBUG);
@@ -39,46 +37,40 @@ function debug($msg) {
 // If it is a Drag'n'Drop transfer it's handled here.
 $fn = (isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : false);
 if ($fn) {
-	// AJAX call
 	if (!isset($_GET['id'])) {
-		OCP\Util::writeLog('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OCP\Util::DEBUG);
-		OCP\JSON::error(array('data' => array( 'message' => 'No contact ID was submitted.' )));
-		exit();
+		bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
 	}
 	$id = $_GET['id'];
-	$tmpfname = tempnam(get_temp_dir(), 'occOrig');
-	file_put_contents($tmpfname, file_get_contents('php://input'));
-	debug($tmpfname.' uploaded');
+	$tmpkey = 'contact-photo-'.md5($fn);
+	$data = file_get_contents('php://input');
 	$image = new OC_Image();
-	if($image->loadFromFile($tmpfname)) {
+	sleep(1); // Apparently it needs time to load the data.
+	if($image->loadFromData($data)) {
 		if($image->width() > 400 || $image->height() > 400) {
 			$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
 		}
 		if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
-			debug('Couldn\'t save correct image orientation: '.$tmpfname);
+			debug('Couldn\'t save correct image orientation: '.$tmpkey);
 		}
-		if($image->save($tmpfname)) {
-			OCP\JSON::success(array('data' => array('mime'=>$_SERVER['CONTENT_TYPE'], 'name'=>$fn, 'id'=>$id, 'tmp'=>$tmpfname)));
+		if(OC_Cache::set($tmpkey, $image->data(), 600)) {
+			OCP\JSON::success(array('data' => array('mime'=>$_SERVER['CONTENT_TYPE'], 'name'=>$fn, 'id'=>$id, 'tmp'=>$tmpkey)));
 			exit();
 		} else {
-			bailOut('Couldn\'t save temporary image: '.$tmpfname);
+			bailOut(OC_Contacts_App::$l10n->t('Couldn\'t save temporary image: ').$tmpkey);
 		}
 	} else {
-		bailOut('Couldn\'t load temporary image: '.$file['tmp_name']);
+		bailOut(OC_Contacts_App::$l10n->t('Couldn\'t load temporary image: ').$tmpkey.$data);
 	}
 }
 
-
+// Uploads from file dialog are handled here.
 if (!isset($_POST['id'])) {
-	OCP\Util::writeLog('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OCP\Util::DEBUG);
-	OCP\JSON::error(array('data' => array( 'message' => 'No contact ID was submitted.' )));
-	exit();
+	bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
 }
 if (!isset($_FILES['imagefile'])) {
-	OCP\Util::writeLog('contacts','ajax/uploadphoto.php: No file was uploaded. Unknown error.', OCP\Util::DEBUG);
-	OCP\JSON::error(array('data' => array( 'message' => 'No file was uploaded. Unknown error' )));
-	exit();
+	bailOut(OC_Contacts_App::$l10n->t('No file was uploaded. Unknown error'));
 }
+
 $error = $_FILES['imagefile']['error'];
 if($error !== UPLOAD_ERR_OK) {
 	$errors = array(
@@ -93,27 +85,26 @@ if($error !== UPLOAD_ERR_OK) {
 }
 $file=$_FILES['imagefile'];
 
-$tmpfname = tempnam(get_temp_dir(), "occOrig");
 if(file_exists($file['tmp_name'])) {
+	$tmpkey = 'contact-photo-'.md5(basename($file['tmp_name']));
 	$image = new OC_Image();
 	if($image->loadFromFile($file['tmp_name'])) {
 		if($image->width() > 400 || $image->height() > 400) {
 			$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
 		}
 		if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
-			debug('Couldn\'t save correct image orientation: '.$tmpfname);
+			debug('Couldn\'t save correct image orientation: '.$tmpkey);
 		}
-		if($image->save($tmpfname)) {
-			OCP\JSON::success(array('data' => array('mime'=>$file['type'],'size'=>$file['size'],'name'=>$file['name'], 'id'=>$_POST['id'], 'tmp'=>$tmpfname)));
+		if(OC_Cache::set($tmpkey, $image->data(), 600)) {
+			OCP\JSON::success(array('data' => array('mime'=>$file['type'],'size'=>$file['size'],'name'=>$file['name'], 'id'=>$_POST['id'], 'tmp'=>$tmpkey)));
 			exit();
 		} else {
-			bailOut('Couldn\'t save temporary image: '.$tmpfname);
+			bailOut(OC_Contacts_App::$l10n->t('Couldn\'t save temporary image: ').$tmpkey);
 		}
 	} else {
-		bailOut('Couldn\'t load temporary image: '.$file['tmp_name']);
+		bailOut(OC_Contacts_App::$l10n->t('Couldn\'t load temporary image: ').$file['tmp_name']);
 	}
 } else {
 	bailOut('Temporary file: \''.$file['tmp_name'].'\' has gone AWOL?');
 }
-
 ?>
diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index fdea4975d5..0ee35f9fd8 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -10,16 +10,21 @@ ob_start();
  
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('contacts');
+session_write_close();
+
 $nl = "\n";
 
-$progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
+global $progresskey;
+$progresskey = 'contacts.import-' . $_GET['progresskey'];
+
+if (isset($_GET['progress']) && $_GET['progress']) {
+	echo OC_Cache::get($progresskey);
+	die;
+}
 
 function writeProgress($pct) {
-	if(is_writable('import_tmp/')){
-		$progressfopen = fopen($progressfile, 'w');
-		fwrite($progressfopen, $pct);
-		fclose($progressfopen);
-	}
+	global $progresskey;
+	OC_Cache::set($progresskey, $pct, 300);
 }
 writeProgress('10');
 $view = $file = null;
@@ -93,9 +98,7 @@ foreach($parts as $part){
 //done the import
 writeProgress('100');
 sleep(3);
-if(is_writable('import_tmp/')){
-	unlink($progressfile);
-}
+OC_Cache::remove($progresskey);
 if(isset($_POST['fstype']) && $_POST['fstype'] == 'OC_FilesystemView') {
 	if(!$view->unlink('/' . $_POST['file'])) {
 		OCP\Util::writeLog('contacts','Import: Error unlinking OC_FilesystemView ' . '/' . $_POST['file'], OCP\Util::ERROR);
diff --git a/apps/contacts/import_tmp/Info b/apps/contacts/import_tmp/Info
deleted file mode 100644
index abafbce435..0000000000
--- a/apps/contacts/import_tmp/Info
+++ /dev/null
@@ -1,2 +0,0 @@
-This folder contains static files with the percentage of the import.
-Requires write permission
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index d8aa724a22..458c9ab8fc 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -134,7 +134,9 @@ Contacts={
 			$('#edit_name').keydown(function(){Contacts.UI.Card.editName()});
 			
 			/* Initialize the photo edit dialog */
-			$('#edit_photo_dialog').dialog({ autoOpen: false, modal: true, height: 'auto', width: 'auto' });
+			$('#edit_photo_dialog').dialog({ 
+				autoOpen: false, modal: true, height: 'auto', width: 'auto'
+			});
 			$('#edit_photo_dialog' ).dialog( 'option', 'buttons', [
 				{
 					text: "Ok",
@@ -162,6 +164,7 @@ Contacts={
 				var name = $('#fn').val().strip_tags();
 				var item = $('#contacts [data-id="'+Contacts.UI.Card.id+'"]');
 				$(item).find('a').html(name);
+				Contacts.UI.Card.fn = name;
 				var added = false;
 				$('#contacts li').each(function(){
 					if ($(this).text().toLowerCase() > name.toLowerCase()) {
@@ -1153,9 +1156,9 @@ Contacts={
 					}
 				});
 			},
-			editPhoto:function(id, tmp_path){
-				//alert('editPhoto: ' + tmp_path);
-				$.getJSON(OC.filePath('contacts', 'ajax', 'cropphoto.php'),{'tmp_path':tmp_path,'id':this.id},function(jsondata){
+			editPhoto:function(id, tmpkey){
+				//alert('editPhoto: ' + tmpkey);
+				$.getJSON(OC.filePath('contacts', 'ajax', 'cropphoto.php'),{'tmpkey':tmpkey,'id':this.id},function(jsondata){
 					if(jsondata.status == 'success'){
 						//alert(jsondata.data.page);
 						$('#edit_photo_dialog_img').html(jsondata.data.page);
@@ -1185,6 +1188,7 @@ Contacts={
 						Contacts.UI.Card.loadPhotoHandlers();
 					}else{
 						OC.dialogs.alert(response.data.message, t('contacts', 'Error'));
+						wrapper.removeClass('wait');
 					}
 				});
 				Contacts.UI.Contacts.refreshThumbnail(this.id);
diff --git a/apps/contacts/js/loader.js b/apps/contacts/js/loader.js
index 8c79ea8a1d..961e0f425c 100644
--- a/apps/contacts/js/loader.js
+++ b/apps/contacts/js/loader.js
@@ -42,8 +42,8 @@ Contacts_Import={
 			}
 			$('#newaddressbook').attr('readonly', 'readonly');
 			$('#contacts').attr('disabled', 'disabled');
-			var progressfile = $('#progressfile').val();
-			$.post(OC.filePath('contacts', '', 'import.php'), {method: String (method), addressbookname: String (addressbookname), path: String (path), file: String (filename), id: String (addressbookid)}, function(jsondata){
+			var progresskey = $('#progresskey').val();
+			$.post(OC.filePath('contacts', '', 'import.php') + '?progresskey='+progresskey, {method: String (method), addressbookname: String (addressbookname), path: String (path), file: String (filename), id: String (addressbookid)}, function(jsondata){
 				if(jsondata.status == 'success'){
 					$('#progressbar').progressbar('option', 'value', 100);
 					$('#import_done').find('p').html(t('contacts', 'Result: ') + jsondata.data.imported + t('contacts', ' imported, ') + jsondata.data.failed + t('contacts', ' failed.'));
@@ -55,7 +55,7 @@ Contacts_Import={
 			});
 			$('#form_container').css('display', 'none');
 			$('#progressbar_container').css('display', 'block');
-			window.setTimeout('Contacts_Import.getimportstatus(\'' + progressfile + '\')', 500);
+			window.setTimeout('Contacts_Import.getimportstatus(\'' + progresskey + '\')', 500);
 		});
 		$('#contacts').change(function(){
 			if($('#contacts option:selected').val() == 'newaddressbook'){
@@ -65,11 +65,11 @@ Contacts_Import={
 			}
 		});
 	},
-	getimportstatus: function(progressfile){
-		$.get(OC.filePath('contacts', 'import_tmp', progressfile), function(percent){
+	getimportstatus: function(progresskey){
+		$.get(OC.filePath('contacts', '', 'import.php') + '?progress=1&progresskey=' + progresskey, function(percent){
 			$('#progressbar').progressbar('option', 'value', parseInt(percent));
 			if(percent < 100){
-				window.setTimeout('Contacts_Import.getimportstatus(\'' + progressfile + '\')', 500);
+				window.setTimeout('Contacts_Import.getimportstatus(\'' + progresskey + '\')', 500);
 			}else{
 				$('#import_done').css('display', 'block');
 			}
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index d2d96dfbac..0c95b83d5e 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Error en afegir la llibreta d'adreces.",
 "Error activating addressbook." => "Error en activar la llibreta d'adreces.",
 "No contact ID was submitted." => "No s'ha tramès cap ID de contacte.",
-"Error loading image." => "Error en carregar la imatge.",
 "Error reading contact photo." => "Error en llegir la foto del contacte.",
 "Error saving temporary file." => "Error en desar el fitxer temporal.",
 "The loading photo is not valid." => "La foto carregada no és vàlida.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Falta la id del contacte.",
 "No photo path was submitted." => "No heu tramès el camí de la foto.",
 "File doesn't exist:" => "El fitxer no existeix:",
+"Error loading image." => "Error en carregar la imatge.",
 "element name is not set." => "no s'ha establert el nom de l'element.",
 "checksum is not set." => "no s'ha establert la suma de verificació.",
 "Information about vCard is incorrect. Please reload the page: " => "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "No s'ha carregat cap fitxer",
 "Missing a temporary folder" => "Falta un fitxer temporal",
 "Contacts" => "Contactes",
+"Drop a VCF file to import contacts." => "Elimina un fitxer VCF per importar contactes.",
 "Addressbook not found." => "No s'ha trobat la llibreta d'adreces.",
 "This is not your addressbook." => "Aquesta no és la vostra llibreta d'adreces",
 "Contact could not be found." => "No s'ha trobat el contacte.",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "Nom de la nova llibreta d'adreces",
 "Import" => "Importa",
 "Importing contacts" => "S'estan important contactes",
-"Contacts imported successfully" => "Els contactes s'han importat correctament",
-"Close Dialog" => "Tanca el diàleg",
-"Import Addressbook" => "Importa la llibreta d'adreces",
 "Select address book to import to:" => "Seleccioneu la llibreta d'adreces a la que voleu importar:",
-"Drop a VCF file to import contacts." => "Elimina un fitxer VCF per importar contactes.",
 "Select from HD" => "Selecciona de HD",
 "You have no contacts in your addressbook." => "No teniu contactes a la llibreta d'adreces.",
 "Add contact" => "Afegeix un contacte",
diff --git a/apps/contacts/l10n/cs_CZ.php b/apps/contacts/l10n/cs_CZ.php
index b510f68c1c..391a62010b 100644
--- a/apps/contacts/l10n/cs_CZ.php
+++ b/apps/contacts/l10n/cs_CZ.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Chyba při přidávání adresáře.",
 "Error activating addressbook." => "Chyba při aktivaci adresáře.",
 "No contact ID was submitted." => "Nebylo nastaveno ID kontaktu.",
-"Error loading image." => "Chyba při načítání obrázku.",
 "Error reading contact photo." => "Chyba při načítání fotky kontaktu.",
 "Error saving temporary file." => "Chyba při ukládání dočasného souboru.",
 "The loading photo is not valid." => "Načítaná fotka je vadná.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Chybí id kontaktu.",
 "No photo path was submitted." => "Žádná fotka nebyla nahrána.",
 "File doesn't exist:" => "Soubor neexistuje:",
+"Error loading image." => "Chyba při načítání obrázku.",
 "element name is not set." => "jméno elementu není nastaveno.",
 "checksum is not set." => "kontrolní součet není nastaven.",
 "Information about vCard is incorrect. Please reload the page: " => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Žádný soubor nebyl nahrán",
 "Missing a temporary folder" => "Chybí dočasný adresář",
 "Contacts" => "Kontakty",
+"Drop a VCF file to import contacts." => "Pro import kontaktů sem přetáhněte soubor VCF",
 "Addressbook not found." => "Adresář nenalezen.",
 "This is not your addressbook." => "Toto není Váš adresář.",
 "Contact could not be found." => "Kontakt nebyl nalezen.",
@@ -114,6 +115,7 @@
 "Addressbook" => "Adresář",
 "Hon. prefixes" => "Tituly před",
 "Miss" => "Slečna",
+"Ms" => "Ms",
 "Mr" => "Pan",
 "Sir" => "Sir",
 "Mrs" => "Paní",
@@ -124,6 +126,8 @@
 "Hon. suffixes" => "Tituly za",
 "J.D." => "JUDr.",
 "M.D." => "MUDr.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
 "Ph.D." => "Ph.D.",
 "Esq." => "Esq.",
 "Jr." => "ml.",
@@ -141,11 +145,7 @@
 "Name of new addressbook" => "Jméno nového adresáře",
 "Import" => "Import",
 "Importing contacts" => "Importování kontaktů",
-"Contacts imported successfully" => "Kontakty úspěšně importovány",
-"Close Dialog" => "Zavírací dialog",
-"Import Addressbook" => "Importovat adresář",
 "Select address book to import to:" => "Vyberte adresář do kterého chcete importovat:",
-"Drop a VCF file to import contacts." => "Pro import kontaktů sem přetáhněte soubor VCF",
 "Select from HD" => "Vybrat z disku",
 "You have no contacts in your addressbook." => "Nemáte žádné kontakty v adresáři.",
 "Add contact" => "Přidat kontakt",
diff --git a/apps/contacts/l10n/da.php b/apps/contacts/l10n/da.php
index 9e82d1967a..28753edda4 100644
--- a/apps/contacts/l10n/da.php
+++ b/apps/contacts/l10n/da.php
@@ -3,14 +3,47 @@
 "There was an error adding the contact." => "Der opstod en fejl ved tilføjelse af kontaktpersonen.",
 "Cannot add empty property." => "Kan ikke tilføje en egenskab uden indhold.",
 "At least one of the address fields has to be filled out." => "Der skal udfyldes mindst et adressefelt.",
+"Trying to add duplicate property: " => "Kan ikke tilføje overlappende element.",
 "Error adding contact property." => "Fejl ved tilføjelse af egenskab.",
+"No ID provided" => "Intet ID medsendt",
+"Error setting checksum." => "Kunne ikke sætte checksum.",
+"No categories selected for deletion." => "Der ikke valgt nogle grupper at slette.",
+"No address books found." => "Der blev ikke fundet nogen adressebøger.",
+"No contacts found." => "Der blev ikke fundet nogen kontaktpersoner.",
+"Missing ID" => "Manglende ID",
+"Error parsing VCard for ID: \"" => "Kunne ikke indlæse VCard med ID'en: \"",
+"Cannot add addressbook with an empty name." => "Kan ikke tilføje adressebog uden et navn.",
 "Error adding addressbook." => "Fejl ved tilføjelse af adressebog.",
 "Error activating addressbook." => "Fejl ved aktivering af adressebog.",
+"No contact ID was submitted." => "Ingen ID for kontakperson medsendt.",
+"Error reading contact photo." => "Kunne ikke indlæse foto for kontakperson.",
+"Error saving temporary file." => "Kunne ikke gemme midlertidig fil.",
+"The loading photo is not valid." => "Billedet under indlæsning er ikke gyldigt.",
+"id is not set." => "Intet ID medsendt.",
 "Information about vCard is incorrect. Please reload the page." => "Informationen om vCard er forkert. Genindlæs siden.",
 "Error deleting contact property." => "Fejl ved sletning af egenskab for kontaktperson.",
+"Contact ID is missing." => "Kontaktperson ID mangler.",
+"Missing contact id." => "Kontaktperson ID mangler.",
+"No photo path was submitted." => "Der blev ikke medsendt en sti til fotoet.",
+"File doesn't exist:" => "Filen eksisterer ikke:",
+"Error loading image." => "Kunne ikke indlæse billede.",
+"element name is not set." => "Element navnet er ikke medsendt.",
+"checksum is not set." => "Checksum er ikke medsendt.",
+"Information about vCard is incorrect. Please reload the page: " => "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: ",
+"Something went FUBAR. " => "Noget gik grueligt galt. ",
 "Error updating contact property." => "Fejl ved opdatering af egenskab for kontaktperson.",
+"Cannot update addressbook with an empty name." => "Kan ikke opdatére adressebogen med et tomt navn.",
 "Error updating addressbook." => "Fejl ved opdatering af adressebog",
+"Error uploading contacts to storage." => "Kunne ikke uploade kontaktepersoner til midlertidig opbevaring.",
+"There is no error, the file uploaded with success" => "Der skete ingen fejl, filen blev succesfuldt uploadet",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den uploadede fil er større end upload_max_filesize indstillingen i php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uploadede fil overstiger MAX_FILE_SIZE indstilingen, som specificeret i HTML formularen",
+"The uploaded file was only partially uploaded" => "Filen blev kun delvist uploadet.",
+"No file was uploaded" => "Ingen fil uploadet",
+"Missing a temporary folder" => "Manglende midlertidig mappe.",
 "Contacts" => "Kontaktpersoner",
+"Drop a VCF file to import contacts." => "Drop en VCF fil for at importere kontaktpersoner.",
+"Addressbook not found." => "Adressebogen blev ikke fundet.",
 "This is not your addressbook." => "Dette er ikke din adressebog.",
 "Contact could not be found." => "Kontaktperson kunne ikke findes.",
 "Address" => "Adresse",
@@ -22,22 +55,53 @@
 "Mobile" => "Mobil",
 "Text" => "SMS",
 "Voice" => "Telefonsvarer",
+"Message" => "Besked",
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Personsøger",
+"Internet" => "Internet",
+"{name}'s Birthday" => "{name}'s fødselsdag",
 "Contact" => "Kontaktperson",
 "Add Contact" => "Tilføj kontaktperson",
 "Addressbooks" => "Adressebøger",
+"Configure Address Books" => "Konfigurer adressebøger",
 "New Address Book" => "Ny adressebog",
+"Import from VCF" => "Importer fra VCF",
 "CardDav Link" => "CardDav-link",
 "Download" => "Download",
 "Edit" => "Rediger",
 "Delete" => "Slet",
 "Download contact" => "Download kontaktperson",
 "Delete contact" => "Slet kontaktperson",
+"Drop photo to upload" => "Drop foto for at uploade",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formatter som valgfrit, fuldt navn, efternavn først eller efternavn først med komma",
+"Edit name details" => "Rediger navnedetaljer.",
+"Nickname" => "Øgenavn",
+"Enter nickname" => "Indtast øgenavn",
 "Birthday" => "Fødselsdag",
+"dd-mm-yyyy" => "dd-mm-åååå",
+"Groups" => "Grupper",
+"Separate groups with commas" => "Opdel gruppenavne med kommaer",
+"Edit groups" => "Rediger grupper",
 "Preferred" => "Foretrukken",
+"Please specify a valid email address." => "Indtast venligst en gyldig email-adresse.",
+"Enter email address" => "Indtast email-adresse",
+"Mail to address" => "Send mail til adresse",
+"Delete email address" => "Slet email-adresse",
+"Enter phone number" => "Indtast telefonnummer",
+"Delete phone number" => "Slet telefonnummer",
+"View on map" => "Vis på kort",
+"Edit address details" => "Rediger adresse detaljer",
+"Add notes here." => "Tilføj noter her.",
+"Add field" => "Tilfæj element",
+"Profile picture" => "Profilbillede",
 "Phone" => "Telefon",
+"Note" => "Note",
+"Delete current photo" => "Slet nuværende foto",
+"Edit current photo" => "Rediger nuværende foto",
+"Upload new photo" => "Upload nyt foto",
+"Select photo from ownCloud" => "Vælg foto fra ownCloud",
+"Edit address" => "Rediger adresse",
 "Type" => "Type",
 "PO Box" => "Postboks",
 "Extended" => "Udvidet",
@@ -46,13 +110,48 @@
 "Region" => "Region",
 "Zipcode" => "Postnummer",
 "Country" => "Land",
+"Edit categories" => "Rediger grupper",
 "Add" => "Tilføj",
 "Addressbook" => "Adressebog",
+"Hon. prefixes" => "Foranstillede titler",
+"Miss" => "Frøken",
+"Ms" => "Fru",
+"Mr" => "Hr.",
+"Sir" => "Sir",
+"Mrs" => "Fru",
+"Dr" => "Dr",
+"Given name" => "Fornavn",
+"Additional names" => "Mellemnavne",
+"Family name" => "Efternavn",
+"Hon. suffixes" => "Efterstillede titler",
+"J.D." => "Cand. Jur.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
 "New Addressbook" => "Ny adressebog",
 "Edit Addressbook" => "Rediger adressebog",
 "Displayname" => "Vist navn",
 "Active" => "Aktiv",
 "Save" => "Gem",
 "Submit" => "Gem",
-"Cancel" => "Fortryd"
+"Cancel" => "Fortryd",
+"Import a contacts file" => "Importer fil med kontaktpersoner",
+"Please choose the addressbook" => "Vælg venligst adressebog",
+"create a new addressbook" => "Opret ny adressebog",
+"Name of new addressbook" => "Navn på ny adressebog",
+"Import" => "Importer",
+"Importing contacts" => "Importerer kontaktpersoner",
+"Select address book to import to:" => "Vælg hvilken adressebog, der skal importeres til:",
+"Select from HD" => "Vælg fra harddisk.",
+"You have no contacts in your addressbook." => "Du har ingen kontaktpersoner i din adressebog.",
+"Add contact" => "Tilføj kontaktpeson.",
+"Configure addressbooks" => "Konfigurer adressebøger",
+"CardDAV syncing addresses" => "CardDAV synkroniserings adresse",
+"more info" => "mere info",
+"Primary address (Kontact et al)" => "Primær adresse (Kontak m. fl.)",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index 222d856090..3a1013eb4f 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Adressbuch hinzufügen fehlgeschlagen",
 "Error activating addressbook." => "Adressbuchaktivierung fehlgeschlagen",
 "No contact ID was submitted." => "Es wurde keine Kontakt-ID übermittelt.",
-"Error loading image." => "Fehler beim Laden des Bildes.",
 "Error reading contact photo." => "Fehler beim auslesen des Kontaktfotos.",
 "Error saving temporary file." => "Fehler beim Speichern der temporären Datei.",
 "The loading photo is not valid." => "Das Kontaktfoto ist fehlerhaft.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Fehlende Kontakt-ID.",
 "No photo path was submitted." => "Kein Foto-Pfad übermittelt.",
 "File doesn't exist:" => "Datei existiert nicht: ",
+"Error loading image." => "Fehler beim Laden des Bildes.",
 "element name is not set." => "Kein Name für das Element angegeben.",
 "checksum is not set." => "Keine Prüfsumme angegeben.",
 "Information about vCard is incorrect. Please reload the page: " => "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: ",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Keine Datei konnte übertragen werden.",
 "Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
 "Contacts" => "Kontakte",
+"Drop a VCF file to import contacts." => "Zieh' eine VCF Datei hierher zum Kontaktimport",
 "Addressbook not found." => "Adressbuch nicht gefunden.",
 "This is not your addressbook." => "Dies ist nicht dein Adressbuch.",
 "Contact could not be found." => "Kontakt konnte nicht gefunden werden.",
@@ -80,7 +81,7 @@
 "Birthday" => "Geburtstag",
 "dd-mm-yyyy" => "TT-MM-JJJJ",
 "Groups" => "Gruppen",
-"Separate groups with commas" => "Gruppen mit Komma trennen",
+"Separate groups with commas" => "Gruppen mit Komma trennt",
 "Edit groups" => "Gruppen editieren",
 "Preferred" => "Bevorzugt",
 "Please specify a valid email address." => "Bitte eine gültige E-Mail-Adresse angeben.",
@@ -123,6 +124,14 @@
 "Additional names" => "Zusätzliche Namen",
 "Family name" => "Familienname",
 "Hon. suffixes" => "Höflichkeitssuffixe",
+"J.D." => "Dr. Jur",
+"M.D." => "Dr. med.",
+"D.O." => "DGOM",
+"D.C." => "MChiro",
+"Ph.D." => "Dr.",
+"Esq." => "Hochwohlgeborenen",
+"Jr." => "Jr.",
+"Sn." => "Senior",
 "New Addressbook" => "Neues Adressbuch",
 "Edit Addressbook" => "Adressbuch editieren",
 "Displayname" => "Anzeigename",
@@ -136,11 +145,8 @@
 "Name of new addressbook" => "Name des neuen Adressbuchs",
 "Import" => "Importieren",
 "Importing contacts" => "Kontakte werden importiert",
-"Contacts imported successfully" => "Kontaktimport erfolgreich",
-"Close Dialog" => "Dialog schließen",
-"Import Addressbook" => "Adressbuch importieren",
 "Select address book to import to:" => "Adressbuch, in das importiert werden soll",
-"Drop a VCF file to import contacts." => "Zieh' eine VCF Datei hierher zum Kontaktimport",
+"Select from HD" => "Von der Festplatte auswählen",
 "You have no contacts in your addressbook." => "Du hast keine Kontakte im Adressbuch.",
 "Add contact" => "Kontakt hinzufügen",
 "Configure addressbooks" => "Adressbücher konfigurieren",
diff --git a/apps/contacts/l10n/el.php b/apps/contacts/l10n/el.php
index fb115a0d4a..f015f0ca36 100644
--- a/apps/contacts/l10n/el.php
+++ b/apps/contacts/l10n/el.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Σφάλμα προσθήκης βιβλίου διευθύνσεων.",
 "Error activating addressbook." => "Σφάλμα ενεργοποίησης βιβλίου διευθύνσεων",
 "No contact ID was submitted." => "Δε υπεβλήθει ID επαφής",
-"Error loading image." => "Σφάλμα φόρτωσης εικόνας",
 "Error reading contact photo." => "Σφάλμα ανάγνωσης εικόνας επαφής",
 "Error saving temporary file." => "Σφάλμα αποθήκευσης προσωρινού αρχείου",
 "The loading photo is not valid." => "Η φορτωμένη φωτογραφία δεν είναι έγκυρη",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Απουσιαζει ID επαφής",
 "No photo path was submitted." => "Δε δόθηκε διαδρομή εικόνας",
 "File doesn't exist:" => "Το αρχείο δεν υπάρχει:",
+"Error loading image." => "Σφάλμα φόρτωσης εικόνας",
 "element name is not set." => "δεν ορίστηκε όνομα στοιχείου",
 "checksum is not set." => "δε ορίστηκε checksum ",
 "Information about vCard is incorrect. Please reload the page: " => "Οι πληροφορίες για τη vCard είναι λανθασμένες.Παρακαλώ ξαναφορτώστε τη σελίδα:",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Δεν ανέβηκε κάποιο αρχείο",
 "Missing a temporary folder" => "Λείπει ο προσωρινός φάκελος",
 "Contacts" => "Επαφές",
+"Drop a VCF file to import contacts." => "Εισάγεται ένα VCF αρχείο για εισαγωγή επαφών",
 "Addressbook not found." => "Δε βρέθηκε βιβλίο διευθύνσεων",
 "This is not your addressbook." => "Αυτό δεν είναι το βιβλίο διευθύνσεων σας.",
 "Contact could not be found." => "Η επαφή δεν μπόρεσε να βρεθεί.",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "Όνομα νέου βιβλίου διευθύνσεων",
 "Import" => "Εισαγωγή",
 "Importing contacts" => "Εισαγωγή επαφών",
-"Contacts imported successfully" => "Οι επαφές εισήχθησαν επιτυχώς",
-"Close Dialog" => "Κλείσιμο διαλόγου",
-"Import Addressbook" => "Εισαγωγή βιβλίου διευθύνσεων",
 "Select address book to import to:" => "Επέλεξε σε ποιο βιβλίο διευθύνσεων για εισαγωγή:",
-"Drop a VCF file to import contacts." => "Εισάγεται ένα VCF αρχείο για εισαγωγή επαφών",
 "Select from HD" => "Επιλογή από HD",
 "You have no contacts in your addressbook." => "Δεν έχεις επαφές στο βιβλίο διευθύνσεων",
 "Add contact" => "Προσθήκη επαφής",
diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php
index faba034681..ffc885a41a 100644
--- a/apps/contacts/l10n/eo.php
+++ b/apps/contacts/l10n/eo.php
@@ -6,6 +6,7 @@
 "Trying to add duplicate property: " => "Provante aldoni duobligitan propraĵon:",
 "Error adding contact property." => "Eraro dum aldono de kontaktopropraĵo.",
 "No ID provided" => "Neniu identigilo proviziĝis.",
+"Error setting checksum." => "Eraro dum agordado de kontrolsumo.",
 "No categories selected for deletion." => "Neniu kategorio elektiĝis por forigi.",
 "No address books found." => "Neniu adresaro troviĝis.",
 "No contacts found." => "Neniu kontakto troviĝis.",
@@ -15,7 +16,6 @@
 "Error adding addressbook." => "Eraro dum aldono de adresaro.",
 "Error activating addressbook." => "Eraro dum aktivigo de adresaro.",
 "No contact ID was submitted." => "Neniu kontaktidentigilo sendiĝis.",
-"Error loading image." => "Eraro dum ŝargado de bildo.",
 "Error reading contact photo." => "Eraro dum lego de kontakta foto.",
 "Error saving temporary file." => "Eraro dum konservado de provizora dosiero.",
 "The loading photo is not valid." => "La alŝutata foto ne validas.",
@@ -26,7 +26,10 @@
 "Missing contact id." => "Mankas kontaktidentigilo.",
 "No photo path was submitted." => "Neniu vojo al foto sendiĝis.",
 "File doesn't exist:" => "Dosiero ne ekzistas:",
+"Error loading image." => "Eraro dum ŝargado de bildo.",
 "element name is not set." => "eronomo ne agordiĝis.",
+"checksum is not set." => "kontrolsumo ne agordiĝis.",
+"Information about vCard is incorrect. Please reload the page: " => "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:",
 "Something went FUBAR. " => "Io FUBAR-is.",
 "Error updating contact property." => "Eraro dum ĝisdatigo de kontaktopropraĵo.",
 "Cannot update addressbook with an empty name." => "Ne eblas ĝisdatigi adresaron kun malplena nomo.",
@@ -36,6 +39,7 @@
 "No file was uploaded" => "Neniu dosiero alŝutiĝis.",
 "Missing a temporary folder" => "Mankas provizora dosierujo.",
 "Contacts" => "Kontaktoj",
+"Drop a VCF file to import contacts." => "Demetu VCF-dosieron por enporti kontaktojn.",
 "Addressbook not found." => "Adresaro ne troviĝis.",
 "This is not your addressbook." => "Ĉi tiu ne estas via adresaro.",
 "Contact could not be found." => "Ne eblis trovi la kontakton.",
@@ -87,6 +91,7 @@
 "Edit address details" => "Redakti detalojn de adreso",
 "Add notes here." => "Aldoni notojn ĉi tie.",
 "Add field" => "Aldoni kampon",
+"Profile picture" => "Profila bildo",
 "Phone" => "Telefono",
 "Note" => "Noto",
 "Delete current photo" => "Forigi nunan foton",
@@ -105,8 +110,17 @@
 "Edit categories" => "Redakti kategoriojn",
 "Add" => "Aldoni",
 "Addressbook" => "Adresaro",
+"Hon. prefixes" => "Honoraj antaŭmetaĵoj",
+"Miss" => "f-ino",
+"Ms" => "s-ino",
+"Mr" => "s-ro",
+"Sir" => "s-ro",
+"Mrs" => "s-ino",
+"Dr" => "d-ro",
 "Given name" => "Persona nomo",
+"Additional names" => "Pliaj nomoj",
 "Family name" => "Familia nomo",
+"Hon. suffixes" => "Honoraj postmetaĵoj",
 "New Addressbook" => "Nova adresaro",
 "Edit Addressbook" => "Redakti adresaron",
 "Displayname" => "Montronomo",
@@ -120,7 +134,13 @@
 "Name of new addressbook" => "Nomo de nova adresaro",
 "Import" => "Enporti",
 "Importing contacts" => "Enportante kontaktojn",
-"Contacts imported successfully" => "Kontaktoj enportiĝis sukcese",
-"Close Dialog" => "Fermi dialogon",
-"Import Addressbook" => "Enporti adresaron"
+"Select address book to import to:" => "Elektu adresaron kien enporti:",
+"Select from HD" => "Elekti el malmoldisko",
+"You have no contacts in your addressbook." => "Vi ne havas kontaktojn en via adresaro",
+"Add contact" => "Aldoni kontakton",
+"Configure addressbooks" => "Agordi adresarojn",
+"CardDAV syncing addresses" => "adresoj por CardDAV-sinkronigo",
+"more info" => "pli da informo",
+"Primary address (Kontact et al)" => "Ĉefa adreso (por Kontakt kaj aliaj)",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/es.php b/apps/contacts/l10n/es.php
index 98b6aaa803..2bdb300aa8 100644
--- a/apps/contacts/l10n/es.php
+++ b/apps/contacts/l10n/es.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Error al añadir la libreta de direcciones.",
 "Error activating addressbook." => "Error al activar la libreta de direcciones.",
 "No contact ID was submitted." => "No se ha mandado ninguna ID de contacto.",
-"Error loading image." => "Error cargando imagen.",
 "Error reading contact photo." => "Error leyendo fotografía del contacto.",
 "Error saving temporary file." => "Error al guardar archivo temporal.",
 "The loading photo is not valid." => "La foto que se estaba cargando no es válida.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Falta la id del contacto.",
 "No photo path was submitted." => "No se ha introducido la ruta de la foto.",
 "File doesn't exist:" => "Archivo inexistente:",
+"Error loading image." => "Error cargando imagen.",
 "element name is not set." => "no se ha puesto ningún nombre de elemento.",
 "checksum is not set." => "no se ha puesto ninguna suma de comprobación.",
 "Information about vCard is incorrect. Please reload the page: " => "La información sobre la vCard es incorrecta. Por favor, recarga la página:",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "No se ha subido ningún archivo",
 "Missing a temporary folder" => "Falta la carpeta temporal",
 "Contacts" => "Contactos",
+"Drop a VCF file to import contacts." => "Suelta un archivo VCF para importar contactos.",
 "Addressbook not found." => "Libreta de direcciones no encontrada.",
 "This is not your addressbook." => "Esta no es tu agenda de contactos.",
 "Contact could not be found." => "No se ha podido encontrar el contacto.",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "Nombre de la nueva agenda",
 "Import" => "Importar",
 "Importing contacts" => "Importando contactos",
-"Contacts imported successfully" => "Contactos importados correctamente",
-"Close Dialog" => "Cerrar Diálogo",
-"Import Addressbook" => "Importar agenda",
 "Select address book to import to:" => "Selecciona una agenda para importar a:",
-"Drop a VCF file to import contacts." => "Suelta un archivo VCF para importar contactos.",
 "Select from HD" => "Seleccionar del disco duro",
 "You have no contacts in your addressbook." => "No hay contactos en tu agenda.",
 "Add contact" => "Añadir contacto",
diff --git a/apps/contacts/l10n/et_EE.php b/apps/contacts/l10n/et_EE.php
index 2baad89521..39a287c961 100644
--- a/apps/contacts/l10n/et_EE.php
+++ b/apps/contacts/l10n/et_EE.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Viga aadressiraamatu lisamisel.",
 "Error activating addressbook." => "Viga aadressiraamatu aktiveerimisel.",
 "No contact ID was submitted." => "Kontakti ID-d pole sisestatud.",
-"Error loading image." => "Viga pildi laadimisel.",
 "Error reading contact photo." => "Viga kontakti foto lugemisel.",
 "Error saving temporary file." => "Viga ajutise faili salvestamisel.",
 "The loading photo is not valid." => "Laetav pilt pole korrektne pildifail.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Puuduv kontakti ID.",
 "No photo path was submitted." => "Foto asukohta pole määratud.",
 "File doesn't exist:" => "Faili pole olemas:",
+"Error loading image." => "Viga pildi laadimisel.",
 "element name is not set." => "elemendi nime pole määratud.",
 "checksum is not set." => "kontrollsummat pole määratud.",
 "Information about vCard is incorrect. Please reload the page: " => "vCard info pole korrektne. Palun lae lehekülg uuesti: ",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Ühtegi faili ei laetud üles",
 "Missing a temporary folder" => "Ajutiste failide kaust puudub",
 "Contacts" => "Kontaktid",
+"Drop a VCF file to import contacts." => "Lohista siia VCF-fail, millest kontakte importida.",
 "Addressbook not found." => "Aadressiraamatut ei leitud",
 "This is not your addressbook." => "See pole sinu aadressiraamat.",
 "Contact could not be found." => "Kontakti ei leitud.",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "Uue aadressiraamatu nimi",
 "Import" => "Impordi",
 "Importing contacts" => "Kontaktide importimine",
-"Contacts imported successfully" => "Kontaktid on imporditud",
-"Close Dialog" => "Sulge dialoog",
-"Import Addressbook" => "Impordi aadressiraamat",
 "Select address book to import to:" => "Vali aadressiraamat, millesse importida:",
-"Drop a VCF file to import contacts." => "Lohista siia VCF-fail, millest kontakte importida.",
 "Select from HD" => "Vali kõvakettalt",
 "You have no contacts in your addressbook." => "Sinu aadressiraamatus pole ühtegi kontakti.",
 "Add contact" => "Lisa kontakt",
diff --git a/apps/contacts/l10n/eu.php b/apps/contacts/l10n/eu.php
index 8366c2b4b5..6dfbf0a7b2 100644
--- a/apps/contacts/l10n/eu.php
+++ b/apps/contacts/l10n/eu.php
@@ -11,7 +11,6 @@
 "Missing ID" => "ID falta da",
 "Error adding addressbook." => "Errore bat egon da helbide liburua gehitzean.",
 "Error activating addressbook." => "Errore bat egon da helbide-liburua aktibatzen.",
-"Error loading image." => "Errore bat izan da irudia kargatzearkoan.",
 "Error reading contact photo." => "Errore bat izan da kontaktuaren argazkia igotzerakoan.",
 "The loading photo is not valid." => "Kargatzen ari den argazkia ez da egokia.",
 "id is not set." => "IDa ez da ezarri.",
@@ -20,6 +19,7 @@
 "Contact ID is missing." => "Kontaktuaren IDa falta da.",
 "Missing contact id." => "Kontaktuaren IDa falta da.",
 "File doesn't exist:" => "Fitxategia ez da existitzen:",
+"Error loading image." => "Errore bat izan da irudia kargatzearkoan.",
 "element name is not set." => "elementuaren izena ez da ezarri.",
 "Error updating contact property." => "Errorea kontaktu propietatea eguneratzean.",
 "Cannot update addressbook with an empty name." => "Ezin da helbide liburua eguneratu izen huts batekin.",
@@ -29,6 +29,7 @@
 "The uploaded file was only partially uploaded" => "Igotako fitxategiaren zati bat bakarrik igo da",
 "No file was uploaded" => "Ez da fitxategirik igo",
 "Contacts" => "Kontaktuak",
+"Drop a VCF file to import contacts." => "Askatu VCF fitxategia kontaktuak inportatzeko.",
 "Addressbook not found." => "Helbide liburua ez da aurkitu",
 "This is not your addressbook." => "Hau ez da zure helbide liburua.",
 "Contact could not be found." => "Ezin izan da kontaktua aurkitu.",
@@ -111,11 +112,7 @@
 "Name of new addressbook" => "Helbide liburuaren izena",
 "Import" => "Inportatu",
 "Importing contacts" => "Kontaktuak inportatzen",
-"Contacts imported successfully" => "Kontaktuak ongi inportatu dira",
-"Close Dialog" => "Dialogoa itxi",
-"Import Addressbook" => "Inporatu helbide liburua",
 "Select address book to import to:" => "Hautau helburuko helbide liburua:",
-"Drop a VCF file to import contacts." => "Askatu VCF fitxategia kontaktuak inportatzeko.",
 "Select from HD" => "Hautatu disko gogorretik",
 "You have no contacts in your addressbook." => "Ez duzu kontakturik zure helbide liburuan.",
 "Add contact" => "Gehitu kontaktua",
diff --git a/apps/contacts/l10n/fa.php b/apps/contacts/l10n/fa.php
index 2a50742b66..9278975c40 100644
--- a/apps/contacts/l10n/fa.php
+++ b/apps/contacts/l10n/fa.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "خطا درهنگام افزودن کتابچه نشانی ها",
 "Error activating addressbook." => "خطا درهنگام فعال سازیکتابچه نشانی ها",
 "No contact ID was submitted." => "هیچ اطلاعاتی راجع به شناسه ارسال نشده",
-"Error loading image." => "خطا در بارگزاری تصویر",
 "Error reading contact photo." => "خطا در خواندن اطلاعات تصویر",
 "Error saving temporary file." => "خطا در ذخیره پرونده موقت",
 "The loading photo is not valid." => "بارگزاری تصویر امکان پذیر نیست",
@@ -27,6 +26,7 @@
 "Missing contact id." => "شما اطلاعات شناسه را فراموش کرده اید",
 "No photo path was submitted." => "هیچ نشانی از تصویرارسال نشده",
 "File doesn't exist:" => "پرونده وجود ندارد",
+"Error loading image." => "خطا در بارگزاری تصویر",
 "element name is not set." => "نام اصلی تنظیم نشده است",
 "checksum is not set." => "checksum تنظیم شده نیست",
 "Information about vCard is incorrect. Please reload the page: " => "اطلاعات کارت ویزا شما غلط است لطفا صفحه را دوباره بارگزاری کنید",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "هیچ پروندهای بارگذاری نشده",
 "Missing a temporary folder" => "یک پوشه موقت گم شده",
 "Contacts" => "اشخاص",
+"Drop a VCF file to import contacts." => "یک پرونده VCF را به اینجا بکشید تا اشخاص افزوده شوند",
 "Addressbook not found." => "کتابچه نشانی ها یافت نشد",
 "This is not your addressbook." => "این کتابچه ی نشانه های شما نیست",
 "Contact could not be found." => "اتصال ویا تماسی یافت نشد",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "نام کتابچه نشانی جدید",
 "Import" => "وارد کردن",
 "Importing contacts" => "وارد کردن اشخاص",
-"Contacts imported successfully" => "اشخاص با موفقیت افزوده شدند",
-"Close Dialog" => "بستن دیالوگ",
-"Import Addressbook" => "وارد کردن کتابچه نشانی",
 "Select address book to import to:" => "یک کتابچه نشانی انتخاب کنید تا وارد شود",
-"Drop a VCF file to import contacts." => "یک پرونده VCF را به اینجا بکشید تا اشخاص افزوده شوند",
 "Select from HD" => "انتخاب از دیسک سخت",
 "You have no contacts in your addressbook." => "شماهیچ شخصی در  کتابچه نشانی خود ندارید",
 "Add contact" => "افزودن اطلاعات شخص مورد نظر",
diff --git a/apps/contacts/l10n/fi_FI.php b/apps/contacts/l10n/fi_FI.php
new file mode 100644
index 0000000000..2e3e91611b
--- /dev/null
+++ b/apps/contacts/l10n/fi_FI.php
@@ -0,0 +1,109 @@
+<?php $TRANSLATIONS = array(
+"There was an error adding the contact." => "Virhe yhteystietoa lisättäessä.",
+"Cannot add empty property." => "Tyhjää ominaisuutta ei voi lisätä.",
+"At least one of the address fields has to be filled out." => "Vähintään yksi osoitekenttä tulee täyttää.",
+"Error adding contact property." => "Virhe lisättäessä ominaisuutta yhteystietoon.",
+"No categories selected for deletion." => "Luokkia ei ole valittu poistettavaksi.",
+"No address books found." => "Osoitekirjoja ei löytynyt.",
+"No contacts found." => "Yhteystietoja ei löytynyt.",
+"Error parsing VCard for ID: \"" => "Virhe jäsennettäessä vCardia tunnisteelle: \"",
+"Cannot add addressbook with an empty name." => "Ilman nimeä olevaa osoitekirjaa ei voi lisätä.",
+"Error adding addressbook." => "Virhe lisättäessä osoitekirjaa.",
+"Error activating addressbook." => "Virhe aktivoitaessa osoitekirjaa.",
+"Error saving temporary file." => "Virhe tallennettaessa tilapäistiedostoa.",
+"Error deleting contact property." => "Virhe poistettaessa yhteystiedon ominaisuutta.",
+"File doesn't exist:" => "Tiedostoa ei ole olemassa:",
+"Error loading image." => "Virhe kuvaa ladatessa.",
+"Error updating contact property." => "Virhe päivitettäessä yhteystiedon ominaisuutta.",
+"Error updating addressbook." => "Virhe päivitettäessä osoitekirjaa.",
+"There is no error, the file uploaded with success" => "Ei virhettä, tiedosto lähetettiin onnistuneesti",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Lähetetyn tiedoston koko ylittää upload_max_filesize-asetuksen arvon php.ini-tiedostossa",
+"The uploaded file was only partially uploaded" => "Lähetetty tiedosto lähetettiin vain osittain",
+"No file was uploaded" => "Tiedostoa ei lähetetty",
+"Missing a temporary folder" => "Tilapäiskansio puuttuu",
+"Contacts" => "Yhteystiedot",
+"Addressbook not found." => "Osoitekirjaa ei löytynyt.",
+"This is not your addressbook." => "Tämä ei ole osoitekirjasi.",
+"Contact could not be found." => "Yhteystietoa ei löytynyt.",
+"Address" => "Osoite",
+"Telephone" => "Puhelin",
+"Email" => "Sähköposti",
+"Organization" => "Organisaatio",
+"Work" => "Työ",
+"Home" => "Koti",
+"Mobile" => "Mobiili",
+"Text" => "Teksti",
+"Voice" => "Ääni",
+"Message" => "Viesti",
+"Fax" => "Faksi",
+"Video" => "Video",
+"Pager" => "Hakulaite",
+"Internet" => "Internet",
+"{name}'s Birthday" => "Henkilön {name} syntymäpäivä",
+"Contact" => "Yhteystieto",
+"Add Contact" => "Lisää yhteystieto",
+"Addressbooks" => "Osoitekirjat",
+"Configure Address Books" => "Muokkaa osoitekirjoja",
+"New Address Book" => "Uusi osoitekirja",
+"Import from VCF" => "Tuo VCF-tiedostosta",
+"CardDav Link" => "CardDav-linkki",
+"Download" => "Lataa",
+"Edit" => "Muokkaa",
+"Delete" => "Poista",
+"Download contact" => "Lataa yhteystieto",
+"Delete contact" => "Poista yhteystieto",
+"Nickname" => "Kutsumanimi",
+"Enter nickname" => "Anna kutsumanimi",
+"Birthday" => "Syntymäpäivä",
+"Groups" => "Ryhmät",
+"Separate groups with commas" => "Erota ryhmät pilkuilla",
+"Edit groups" => "Muokkaa ryhmiä",
+"Please specify a valid email address." => "Anna kelvollinen sähköpostiosoite.",
+"Enter email address" => "Anna sähköpostiosoite",
+"Delete email address" => "Poista sähköpostiosoite",
+"Enter phone number" => "Anna puhelinnumero",
+"Delete phone number" => "Poista puhelinnumero",
+"View on map" => "Näytä kartalla",
+"Add notes here." => "Lisää huomiot tähän.",
+"Add field" => "Lisää kenttä",
+"Profile picture" => "Profiilikuva",
+"Phone" => "Puhelin",
+"Note" => "Huomio",
+"Delete current photo" => "Poista nykyinen valokuva",
+"Edit current photo" => "Muokkaa nykyistä valokuvaa",
+"Upload new photo" => "Lähetä uusi valokuva",
+"Select photo from ownCloud" => "Valitse valokuva ownCloudista",
+"Edit address" => "Muokkaa osoitetta",
+"Type" => "Tyyppi",
+"PO Box" => "Postilokero",
+"Extended" => "Laajennettu",
+"Street" => "Katuosoite",
+"City" => "Paikkakunta",
+"Region" => "Alue",
+"Zipcode" => "Postinumero",
+"Country" => "Maa",
+"Edit categories" => "Muokkaa luokkia",
+"Add" => "Lisää",
+"Addressbook" => "Osoitekirja",
+"Given name" => "Etunimi",
+"Additional names" => "Lisänimet",
+"Family name" => "Sukunimi",
+"New Addressbook" => "Uusi osoitekirja",
+"Edit Addressbook" => "Muokkaa osoitekirjaa",
+"Active" => "Aktiivinen",
+"Save" => "Tallenna",
+"Submit" => "Lähetä",
+"Cancel" => "Peru",
+"Import a contacts file" => "Tuo yhteystiedon sisältävä tiedosto",
+"Please choose the addressbook" => "Valitse osoitekirja",
+"create a new addressbook" => "luo uusi osoitekirja",
+"Name of new addressbook" => "Uuden osoitekirjan nimi",
+"Import" => "Tuo",
+"Importing contacts" => "Tuodaan yhteystietoja",
+"Select address book to import to:" => "Valitse osoitekirja, johon yhteystiedot tuodaan:",
+"You have no contacts in your addressbook." => "Osoitekirjassasi ei ole yhteystietoja.",
+"Add contact" => "Lisää yhteystieto",
+"Configure addressbooks" => "Muokkaa osoitekirjoja",
+"CardDAV syncing addresses" => "CardDAV-synkronointiosoitteet",
+"iOS/OS X" => "iOS/OS X"
+);
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index 6b753dcec9..0a2a4e58b9 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Erreur lors de l'ajout du carnet d'adresses.",
 "Error activating addressbook." => "Erreur lors de l'activation du carnet d'adresses.",
 "No contact ID was submitted." => "Aucun ID de contact envoyé",
-"Error loading image." => "Erreur lors du chargement de l'image.",
 "Error reading contact photo." => "Erreur de lecture de la photo du contact.",
 "Error saving temporary file." => "Erreur de sauvegarde du fichier temporaire.",
 "The loading photo is not valid." => "La photo chargée est invalide.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "ID contact manquant.",
 "No photo path was submitted." => "Le chemin de la photo n'a pas été envoyé.",
 "File doesn't exist:" => "Fichier inexistant:",
+"Error loading image." => "Erreur lors du chargement de l'image.",
 "element name is not set." => "Le champ Nom n'est pas défini.",
 "checksum is not set." => "L'hachage n'est pas défini.",
 "Information about vCard is incorrect. Please reload the page: " => "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir la page:",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Pas de fichier envoyé.",
 "Missing a temporary folder" => "Absence de dossier temporaire.",
 "Contacts" => "Contacts",
+"Drop a VCF file to import contacts." => "Glisser un fichier VCF pour importer des contacts.",
 "Addressbook not found." => "Carnet d'adresses introuvable.",
 "This is not your addressbook." => "Ce n'est pas votre carnet d'adresses.",
 "Contact could not be found." => "Ce contact n'a pu être trouvé.",
@@ -122,6 +123,7 @@
 "Additional names" => "Nom supplémentaires",
 "Family name" => "Nom de famille",
 "Hon. suffixes" => "Suffixes hon.",
+"Ph.D." => "Dr",
 "New Addressbook" => "Nouveau carnet d'adresses",
 "Edit Addressbook" => "Éditer le carnet d'adresses",
 "Displayname" => "Nom",
@@ -135,11 +137,7 @@
 "Name of new addressbook" => "Nom du nouveau carnet d'adresses",
 "Import" => "Importer",
 "Importing contacts" => "Importation des contacts",
-"Contacts imported successfully" => "Contacts importés avec succes",
-"Close Dialog" => "Fermer la boite de dialogue",
-"Import Addressbook" => "Importer un carnet d'adresses.",
 "Select address book to import to:" => "Selectionner le carnet d'adresses à importer vers:",
-"Drop a VCF file to import contacts." => "Glisser un fichier VCF pour importer des contacts.",
 "Select from HD" => "Selectionner depuis le disque dur",
 "You have no contacts in your addressbook." => "Il n'y a pas de contact dans votre carnet d'adresses.",
 "Add contact" => "Ajouter un contact",
diff --git a/apps/contacts/l10n/he.php b/apps/contacts/l10n/he.php
index 28640e0ea4..6e40ad71e1 100644
--- a/apps/contacts/l10n/he.php
+++ b/apps/contacts/l10n/he.php
@@ -1,5 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "שגיאה בהפעלה או בנטרול פנקס הכתובות.",
+"There was an error adding the contact." => "אירעה שגיאה בעת הוספת איש הקשר.",
+"Cannot add empty property." => "לא ניתן להוסיף מאפיין ריק.",
+"At least one of the address fields has to be filled out." => "יש למלא לפחות אחד משדות הכתובת.",
+"Trying to add duplicate property: " => "ניסיון להוספת מאפיין כפול: ",
+"Error adding contact property." => "שגיאה בהוספת מאפיין לאיש הקשר.",
+"No ID provided" => "לא צוין מזהה",
+"Error setting checksum." => "שגיאה בהגדרת נתוני הביקורת.",
+"No categories selected for deletion." => "לא נבחור קטגוריות למחיקה.",
+"No address books found." => "לא נמצאו פנקסי כתובות.",
+"No contacts found." => "לא נמצאו אנשי קשר.",
+"Missing ID" => "מזהה חסר",
+"Error adding addressbook." => "שגיאה בהוספת פנקס הכתובות.",
+"Error activating addressbook." => "שגיאה בהפעלת פנקס הכתובות.",
 "Information about vCard is incorrect. Please reload the page." => "המידע אודות vCard אינו נכון. נא לטעון מחדש את הדף.",
+"Error deleting contact property." => "שגיאה במחיקת מאפיין של איש הקשר.",
+"Error updating contact property." => "שגיאה בעדכון המאפיין של איש הקשר.",
+"Error updating addressbook." => "שגיאה בעדכון פנקס הכתובות.",
+"Contacts" => "אנשי קשר",
 "This is not your addressbook." => "זהו אינו ספר הכתובות שלך",
 "Contact could not be found." => "לא ניתן לאתר איש קשר",
 "Address" => "כתובת",
@@ -14,16 +32,34 @@
 "Fax" => "פקס",
 "Video" => "וידאו",
 "Pager" => "זימונית",
+"Contact" => "איש קשר",
 "Add Contact" => "הוספת איש קשר",
+"Addressbooks" => "פנקסי כתובות",
+"New Address Book" => "פנקס כתובות חדש",
+"CardDav Link" => "קישור ",
+"Download" => "הורדה",
 "Edit" => "עריכה",
 "Delete" => "מחיקה",
+"Download contact" => "הורדת איש קשר",
+"Delete contact" => "מחיקת איש קשר",
 "Birthday" => "יום הולדת",
+"Preferred" => "מועדף",
 "Phone" => "טלפון",
+"Type" => "סוג",
 "PO Box" => "תא דואר",
 "Extended" => "מורחב",
 "Street" => "רחוב",
 "City" => "עיר",
 "Region" => "אזור",
 "Zipcode" => "מיקוד",
-"Country" => "מדינה"
+"Country" => "מדינה",
+"Add" => "הוספה",
+"Addressbook" => "פנקס כתובות",
+"New Addressbook" => "פנקס כתובות חדש",
+"Edit Addressbook" => "עריכת פנקס הכתובות",
+"Displayname" => "שם התצוגה",
+"Active" => "פעיל",
+"Save" => "שמירה",
+"Submit" => "ביצוע",
+"Cancel" => "ביטול"
 );
diff --git a/apps/contacts/l10n/hr.php b/apps/contacts/l10n/hr.php
index 9950b512fc..d381bf4fa9 100644
--- a/apps/contacts/l10n/hr.php
+++ b/apps/contacts/l10n/hr.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Information about vCard is incorrect. Please reload the page." => "Informacija o vCard je neispravna. Osvježite stranicu.",
+"File doesn't exist:" => "Datoteka ne postoji:",
+"Contacts" => "Kontakti",
 "This is not your addressbook." => "Ovo nije vaš adresar.",
 "Contact could not be found." => "Kontakt ne postoji.",
 "Address" => "Adresa",
@@ -14,16 +16,48 @@
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Pager",
+"Contact" => "Kontakt",
 "Add Contact" => "Dodaj kontakt",
+"Addressbooks" => "Adresari",
+"New Address Book" => "Novi adresar",
+"CardDav Link" => "CardDav poveznica",
+"Download" => "Preuzimanje",
 "Edit" => "Uredi",
 "Delete" => "Obriši",
+"Download contact" => "Preuzmi kontakt",
+"Delete contact" => "Izbriši kontakt",
+"Edit name details" => "Uredi detalje imena",
+"Nickname" => "Nadimak",
+"Enter nickname" => "Unesi nadimank",
 "Birthday" => "Rođendan",
+"dd-mm-yyyy" => "dd-mm-yyyy",
+"Groups" => "Grupe",
+"Edit groups" => "Uredi grupe",
+"Enter email address" => "Unesi email adresu",
+"Enter phone number" => "Unesi broj telefona",
+"View on map" => "Prikaži na karti",
+"Edit address details" => "Uredi detalje adrese",
+"Add notes here." => "Dodaj bilješke ovdje.",
+"Add field" => "Dodaj polje",
 "Phone" => "Telefon",
+"Note" => "Bilješka",
+"Edit current photo" => "Uredi trenutnu sliku",
+"Edit address" => "Uredi adresu",
+"Type" => "Tip",
 "PO Box" => "Poštanski Pretinac",
 "Extended" => "Prošireno",
 "Street" => "Ulica",
 "City" => "Grad",
 "Region" => "Regija",
 "Zipcode" => "Poštanski broj",
-"Country" => "Država"
+"Country" => "Država",
+"Edit categories" => "Uredi kategorije",
+"Add" => "Dodaj",
+"Addressbook" => "Adresar",
+"New Addressbook" => "Novi adresar",
+"Edit Addressbook" => "Uredi adresar",
+"Save" => "Spremi",
+"Submit" => "Pošalji",
+"Cancel" => "Prekini",
+"Import" => "Uvezi"
 );
diff --git a/apps/contacts/l10n/hu_HU.php b/apps/contacts/l10n/hu_HU.php
index 9f392bc8a5..68f7b2607e 100644
--- a/apps/contacts/l10n/hu_HU.php
+++ b/apps/contacts/l10n/hu_HU.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Címlista (de)aktiválása sikertelen",
-"There was an error adding the contact." => "Hiba a kontakt hozzáadásakor",
+"There was an error adding the contact." => "Hiba a kapcsolat hozzáadásakor",
 "Cannot add empty property." => "Nem adható hozzá üres tulajdonság",
 "At least one of the address fields has to be filled out." => "Legalább egy címmező kitöltendő",
 "Trying to add duplicate property: " => "Kísérlet dupla tulajdonság hozzáadására: ",
-"Error adding contact property." => "Hiba a kontakt-tulajdonság hozzáadásakor",
+"Error adding contact property." => "Hiba a kapcsolat-tulajdonság hozzáadásakor",
 "No ID provided" => "Nincs ID megadva",
 "Error setting checksum." => "Hiba az ellenőrzőösszeg beállításakor",
 "No categories selected for deletion." => "Nincs kiválasztva törlendő kategória",
@@ -16,32 +16,33 @@
 "Error adding addressbook." => "Hiba a címlista hozzáadásakor",
 "Error activating addressbook." => "Címlista aktiválása sikertelen",
 "No contact ID was submitted." => "Nincs ID megadva a kontakthoz",
-"Error loading image." => "Kép betöltése sikertelen",
 "Error reading contact photo." => "A kontakt képének beolvasása sikertelen",
 "Error saving temporary file." => "Ideiglenes fájl mentése sikertelen",
 "The loading photo is not valid." => "A kép érvénytelen",
 "id is not set." => "ID nincs beállítva",
 "Information about vCard is incorrect. Please reload the page." => "A vCardról szóló információ helytelen. Töltsd újra az oldalt.",
-"Error deleting contact property." => "Hiba a kontakt-tulajdonság törlésekor",
-"Contact ID is missing." => "Hiányzik a kontakt ID",
+"Error deleting contact property." => "Hiba a kapcsolat-tulajdonság törlésekor",
+"Contact ID is missing." => "Hiányzik a kapcsolat ID",
 "Missing contact id." => "Hiányzik a kontakt ID",
 "No photo path was submitted." => "Nincs fénykép-útvonal megadva",
 "File doesn't exist:" => "A fájl nem létezik:",
+"Error loading image." => "Kép betöltése sikertelen",
 "element name is not set." => "az elem neve nincs beállítva",
 "checksum is not set." => "az ellenőrzőösszeg nincs beállítva",
 "Information about vCard is incorrect. Please reload the page: " => "Helytelen információ a vCardról. Töltse újra az oldalt: ",
 "Something went FUBAR. " => "Valami balul sült el.",
-"Error updating contact property." => "Hiba a kontakt-tulajdonság frissítésekor",
+"Error updating contact property." => "Hiba a kapcsolat-tulajdonság frissítésekor",
 "Cannot update addressbook with an empty name." => "Üres névvel nem frissíthető a címlista",
 "Error updating addressbook." => "Hiba a címlista frissítésekor",
-"Error uploading contacts to storage." => "Hiba a kontaktok feltöltésekor",
+"Error uploading contacts to storage." => "Hiba a kapcsolatok feltöltésekor",
 "There is no error, the file uploaded with success" => "Nincs hiba, a fájl sikeresen feltöltődött",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "A feltöltött fájl mérete meghaladja az upload_max_filesize értéket a php.ini-ben",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "A feltöltött fájl mérete meghaladja a HTML form-ban megadott MAX_FILE_SIZE értéket",
 "The uploaded file was only partially uploaded" => "A fájl csak részlegesen lett feltöltve",
 "No file was uploaded" => "Nincs feltöltött fájl",
 "Missing a temporary folder" => "Hiányzik az ideiglenes könyvtár",
-"Contacts" => "Kontaktok",
+"Contacts" => "Kapcsolatok",
+"Drop a VCF file to import contacts." => "Húzza ide a VCF fájlt a kapcsolatok importálásához",
 "Addressbook not found." => "Címlista nem található",
 "This is not your addressbook." => "Ez nem a te címjegyzéked.",
 "Contact could not be found." => "Kapcsolat nem található.",
@@ -60,8 +61,8 @@
 "Pager" => "Személyhívó",
 "Internet" => "Internet",
 "{name}'s Birthday" => "{name} születésnapja",
-"Contact" => "Kontakt",
-"Add Contact" => "Kontakt hozzáadása",
+"Contact" => "Kapcsolat",
+"Add Contact" => "Kapcsolat hozzáadása",
 "Addressbooks" => "Címlisták",
 "Configure Address Books" => "Címlisták beállítása",
 "New Address Book" => "Új címlista",
@@ -70,8 +71,8 @@
 "Download" => "Letöltés",
 "Edit" => "Szerkesztés",
 "Delete" => "Törlés",
-"Download contact" => "Kontakt letöltése",
-"Delete contact" => "Kontakt törlése",
+"Download contact" => "Kapcsolat letöltése",
+"Delete contact" => "Kapcsolat törlése",
 "Drop photo to upload" => "Húzza ide a feltöltendő képet",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formátum egyedi, Rövid név, Teljes név, Visszafelé vagy Visszafelé vesszővel",
 "Edit name details" => "Név részleteinek szerkesztése",
@@ -118,7 +119,7 @@
 "Mr" => "Mr",
 "Sir" => "Sir",
 "Mrs" => "Mrs",
-"Dr" => "Dr",
+"Dr" => "Dr.",
 "Given name" => "Teljes név",
 "Additional names" => "További nevek",
 "Family name" => "Családnév",
@@ -138,23 +139,19 @@
 "Save" => "Mentés",
 "Submit" => "Elküld",
 "Cancel" => "Mégsem",
-"Import a contacts file" => "Kontakt-fájl importálása",
+"Import a contacts file" => "Kapcsolat-fájl importálása",
 "Please choose the addressbook" => "Válassza ki a címlistát",
 "create a new addressbook" => "Címlista létrehozása",
 "Name of new addressbook" => "Új címlista neve",
 "Import" => "Import",
-"Importing contacts" => "Kontaktok importálása",
-"Contacts imported successfully" => "Kontaktok importálása sikeres",
-"Close Dialog" => "Párbeszédablak bezárása",
-"Import Addressbook" => "Címlista importálása",
+"Importing contacts" => "Kapcsolatok importálása",
 "Select address book to import to:" => "Melyik címlistába történjen az importálás:",
-"Drop a VCF file to import contacts." => "Húzza ide a VCF fájlt a kontaktok importálásához",
 "Select from HD" => "Kiválasztás merevlemezről",
-"You have no contacts in your addressbook." => "Nincs kontakt a címlistában",
-"Add contact" => "Kontakt hozzáadása",
+"You have no contacts in your addressbook." => "Nincsenek kapcsolatok a címlistában",
+"Add contact" => "Kapcsolat hozzáadása",
 "Configure addressbooks" => "Címlisták beállítása",
 "CardDAV syncing addresses" => "CardDAV szinkronizációs címek",
-"more info" => "további infó",
+"more info" => "további információ",
 "Primary address (Kontact et al)" => "Elsődleges cím",
 "iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/ia.php b/apps/contacts/l10n/ia.php
index be4f8267a9..f420b48d84 100644
--- a/apps/contacts/l10n/ia.php
+++ b/apps/contacts/l10n/ia.php
@@ -4,8 +4,8 @@
 "No contacts found." => "Nulle contactos trovate.",
 "Error adding addressbook." => "Error durante que il addeva le adressario.",
 "Error activating addressbook." => "Error in activar adressario",
-"Error loading image." => "Il habeva un error durante le cargamento del imagine.",
 "Error saving temporary file." => "Error durante le scriptura in le file temporari",
+"Error loading image." => "Il habeva un error durante le cargamento del imagine.",
 "No file was uploaded" => "Nulle file esseva incargate.",
 "Missing a temporary folder" => "Manca un dossier temporari",
 "Contacts" => "Contactos",
@@ -88,9 +88,6 @@
 "create a new addressbook" => "Crear un nove adressario",
 "Name of new addressbook" => "Nomine del nove gruppo:",
 "Import" => "Importar",
-"Contacts imported successfully" => "Contactos importate con successo.",
-"Close Dialog" => "Clauder dialogo",
-"Import Addressbook" => "Importar adressario.",
 "Add contact" => "Adder adressario",
 "more info" => "plus info",
 "iOS/OS X" => "iOS/OS X"
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index ce016063ea..2a5478e6c4 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Errore durante l'aggiunta della rubrica.",
 "Error activating addressbook." => "Errore durante l'attivazione della rubrica.",
 "No contact ID was submitted." => "Nessun ID di contatto inviato.",
-"Error loading image." => "Errore di caricamento immagine.",
 "Error reading contact photo." => "Errore di lettura della foto del contatto.",
 "Error saving temporary file." => "Errore di salvataggio del file temporaneo.",
 "The loading photo is not valid." => "La foto caricata non è valida.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "ID di contatto mancante.",
 "No photo path was submitted." => "Non è stato inviato alcun percorso a una foto.",
 "File doesn't exist:" => "Il file non esiste:",
+"Error loading image." => "Errore di caricamento immagine.",
 "element name is not set." => "il nome dell'elemento non è impostato.",
 "checksum is not set." => "il codice di controllo non è impostato.",
 "Information about vCard is incorrect. Please reload the page: " => "Le informazioni della vCard non sono corrette. Ricarica la pagina: ",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Nessun file è stato inviato",
 "Missing a temporary folder" => "Manca una cartella temporanea",
 "Contacts" => "Contatti",
+"Drop a VCF file to import contacts." => "Rilascia un file VCF per importare i contatti.",
 "Addressbook not found." => "Rubrica non trovata.",
 "This is not your addressbook." => "Questa non è la tua rubrica.",
 "Contact could not be found." => "Il contatto non può essere trovato.",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "Nome della nuova rubrica",
 "Import" => "Importa",
 "Importing contacts" => "Importazione contatti",
-"Contacts imported successfully" => "Contatti importati correttamente",
-"Close Dialog" => "Chiudi finestra",
-"Import Addressbook" => "Importa rubrica",
 "Select address book to import to:" => "Seleziona la rubrica di destinazione:",
-"Drop a VCF file to import contacts." => "Rilascia un file VCF per importare i contatti.",
 "Select from HD" => "Seleziona da disco",
 "You have no contacts in your addressbook." => "Non hai contatti nella rubrica.",
 "Add contact" => "Aggiungi contatto",
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index 8091aff9c8..d98e58f94d 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -1,16 +1,46 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "電話帳の有効/無効化に失敗しました。",
+"Error (de)activating addressbook." => "アドレスブックの有効/無効化に失敗しました。",
 "There was an error adding the contact." => "連絡先の追加でエラーが発生しました。",
 "Cannot add empty property." => "項目の新規追加に失敗しました。",
-"At least one of the address fields has to be filled out." => "アドレス項目の１つは記入して下さい。",
+"At least one of the address fields has to be filled out." => "住所の項目のうち１つは入力して下さい。",
 "Error adding contact property." => "連絡先の追加に失敗しました。",
-"Error adding addressbook." => "電話帳の追加に失敗しました。",
-"Error activating addressbook." => "電話帳の有効化に失敗しました。",
+"No ID provided" => "IDが提供されていません",
+"Error setting checksum." => "チェックサムの設定エラー。",
+"No categories selected for deletion." => "削除するカテゴリが選択されていません。",
+"No address books found." => "アドレスブックが見つかりません。",
+"No contacts found." => "連絡先が見つかりません。",
+"Error parsing VCard for ID: \"" => "VCardからIDの抽出エラー: \"",
+"Cannot add addressbook with an empty name." => "名前を空白にしたままでアドレスブックを追加することはできません。",
+"Error adding addressbook." => "アドレスブックの追加に失敗しました。",
+"Error activating addressbook." => "アドレスブックの有効化に失敗しました。",
+"No contact ID was submitted." => "連絡先IDは登録されませんでした。",
+"Error reading contact photo." => "連絡先写真の読み込みエラー。",
+"Error saving temporary file." => "一時ファイルの保存エラー。",
+"The loading photo is not valid." => "写真の読み込みは無効です。",
+"id is not set." => "idが設定されていません。",
 "Information about vCard is incorrect. Please reload the page." => "vCardの情報に誤りがあります。ページをリロードして下さい。",
 "Error deleting contact property." => "連絡先の削除に失敗しました。",
+"Contact ID is missing." => "コンタクトIDが見つかりません。",
+"Missing contact id." => "コンタクトIDが設定されていません。",
+"No photo path was submitted." => "写真のパスが登録されていません。",
+"File doesn't exist:" => "ファイルが存在しません:",
+"Error loading image." => "画像の読み込みエラー。",
+"element name is not set." => "要素名が設定されていません。",
+"checksum is not set." => "チェックサムが設定されていません。",
+"Information about vCard is incorrect. Please reload the page: " => "vCardの情報が正しくありません。ページを再読み込みしてください: ",
 "Error updating contact property." => "連絡先の更新に失敗しました。",
-"Error updating addressbook." => "電話帳の更新に失敗しました。",
+"Cannot update addressbook with an empty name." => "空白の名前でアドレスブックを更新することはできません。",
+"Error updating addressbook." => "アドレスブックの更新に失敗しました。",
+"Error uploading contacts to storage." => "ストレージへの連絡先のアップロードエラー。",
+"There is no error, the file uploaded with success" => "エラーはありません。ファイルのアップロードは成功しました",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "アップロードファイルは php.ini 内の upload_max_filesize の制限を超えています",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "アップロードファイルはHTMLフォームで指定された MAX_FILE_SIZE の制限を超えています",
+"The uploaded file was only partially uploaded" => "アップロードファイルは一部分だけアップロードされました",
+"No file was uploaded" => "ファイルはアップロードされませんでした",
+"Missing a temporary folder" => "一時保存フォルダが見つかりません",
 "Contacts" => "連絡先",
+"Drop a VCF file to import contacts." => "連絡先をインポートするVCFファイルをドロップしてください。",
+"Addressbook not found." => "アドレスブックが見つかりませんでした。",
 "This is not your addressbook." => "これはあなたの電話帳ではありません。",
 "Contact could not be found." => "連絡先を見つける事ができません。",
 "Address" => "住所",
@@ -22,37 +52,101 @@
 "Mobile" => "携帯電話",
 "Text" => "TTY TDD",
 "Voice" => "音声番号",
+"Message" => "メッセージ",
 "Fax" => "FAX",
 "Video" => "テレビ電話",
 "Pager" => "ポケベル",
+"Internet" => "インターネット",
+"{name}'s Birthday" => "{name}の誕生日",
 "Contact" => "連絡先",
 "Add Contact" => "連絡先の追加",
 "Addressbooks" => "電話帳",
+"Configure Address Books" => "アドレスブックを設定",
 "New Address Book" => "新規電話帳",
-"CardDav Link" => "CardDAV リンク",
+"Import from VCF" => "VCFからインポート",
+"CardDav Link" => "CardDAVリンク",
 "Download" => "ダウンロード",
 "Edit" => "編集",
 "Delete" => "削除",
 "Download contact" => "連絡先のダウンロード",
 "Delete contact" => "連絡先の削除",
-"Birthday" => "生年月日",
+"Drop photo to upload" => "写真をドロップしてアップロード",
+"Edit name details" => "名前の詳細を編集",
+"Nickname" => "ニックネーム",
+"Enter nickname" => "ニックネームを入力",
+"Birthday" => "誕生日",
+"dd-mm-yyyy" => "yyyy-mm-dd",
+"Groups" => "グループ",
+"Separate groups with commas" => "コンマでグループを分割",
+"Edit groups" => "グループを編集",
 "Preferred" => "推奨",
+"Please specify a valid email address." => "連絡先を追加",
+"Enter email address" => "メールアドレスを入力",
+"Mail to address" => "アドレスへメールを送る",
+"Delete email address" => "メールアドレスを削除",
+"Enter phone number" => "電話番号を入力",
+"Delete phone number" => "電話番号を削除",
+"View on map" => "地図で表示",
+"Edit address details" => "住所の詳細を編集",
+"Add notes here." => "ここにメモを追加。",
+"Add field" => "項目を追加",
+"Profile picture" => "プロフィール写真",
 "Phone" => "電話番号",
+"Note" => "メモ",
+"Delete current photo" => "現在の写真を削除",
+"Edit current photo" => "現在の写真を編集",
+"Upload new photo" => "新しい写真をアップロード",
+"Select photo from ownCloud" => "ownCloudから写真を選択",
+"Edit address" => "住所を編集",
 "Type" => "種類",
 "PO Box" => "私書箱",
-"Extended" => "拡張番地",
-"Street" => "街路番地",
+"Extended" => "番地2",
+"Street" => "番地1",
 "City" => "都市",
-"Region" => "地域",
+"Region" => "都道府県",
 "Zipcode" => "郵便番号",
 "Country" => "国名",
+"Edit categories" => "カテゴリを編集",
 "Add" => "追加",
-"Addressbook" => "電話帳",
-"New Addressbook" => "電話帳の新規作成",
-"Edit Addressbook" => "電話帳の編集",
+"Addressbook" => "アドレスブック",
+"Miss" => "Miss",
+"Ms" => "Ms",
+"Mr" => "Mr",
+"Sir" => "Sir",
+"Mrs" => "Mrs",
+"Dr" => "Dr",
+"Given name" => "名",
+"Additional names" => "ミドルネーム",
+"Family name" => "姓",
+"Hon. suffixes" => "ストレージへの連絡先のアップロードエラー。",
+"J.D." => "J.D.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
+"New Addressbook" => "アドレスブックの新規作成",
+"Edit Addressbook" => "アドレスブックを編集",
 "Displayname" => "表示名",
 "Active" => "アクティブ",
 "Save" => "保存",
 "Submit" => "送信",
-"Cancel" => "取り消し"
+"Cancel" => "取り消し",
+"Import a contacts file" => "コンタクトファイルをインポート",
+"Please choose the addressbook" => "アドレスブックを選択してください",
+"create a new addressbook" => "新しいアドレスブックを作成",
+"Name of new addressbook" => "新しいアドレスブックの名前",
+"Import" => "インポート",
+"Importing contacts" => "コンタクトをインポート",
+"Select address book to import to:" => "インポートするアドレスブックを選択:",
+"Select from HD" => "HDから選択",
+"You have no contacts in your addressbook." => "アドレスブックに連絡先が登録されていません。",
+"Add contact" => "連絡先を追加",
+"Configure addressbooks" => "アドレス帳を設定",
+"CardDAV syncing addresses" => "CardDAV同期アドレス",
+"more info" => "詳細情報",
+"Primary address (Kontact et al)" => "プライマリアドレス（Kontact 他）",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/ko.php b/apps/contacts/l10n/ko.php
index bba3e29d2e..fcdc1d08c6 100644
--- a/apps/contacts/l10n/ko.php
+++ b/apps/contacts/l10n/ko.php
@@ -14,7 +14,6 @@
 "Error adding addressbook." => "주소록을 추가할 수 없습니다.",
 "Error activating addressbook." => "주소록을 활성화할 수 없습니다.",
 "No contact ID was submitted." => "접속 아이디가 기입되지 않았습니다.",
-"Error loading image." => "로딩 이미지 오류입니다.",
 "Error reading contact photo." => "사진 읽기 오류",
 "Error saving temporary file." => "임시 파일을 저장하는 동안 오류가 발생했습니다. ",
 "The loading photo is not valid." => "로딩 사진이 유효하지 않습니다. ",
@@ -24,6 +23,7 @@
 "Contact ID is missing." => "접속 아이디가 없습니다. ",
 "Missing contact id." => "접속 아이디 분실",
 "File doesn't exist:" => "파일이 존재하지 않습니다. ",
+"Error loading image." => "로딩 이미지 오류입니다.",
 "Error updating contact property." => "연락처 속성을 업데이트할 수 없습니다.",
 "Error updating addressbook." => "주소록을 업데이트할 수 없습니다.",
 "No file was uploaded" => "파일이 업로드 되어있지 않습니다",
diff --git a/apps/contacts/l10n/lb.php b/apps/contacts/l10n/lb.php
index 82b84b09d7..361e1cb93e 100644
--- a/apps/contacts/l10n/lb.php
+++ b/apps/contacts/l10n/lb.php
@@ -14,16 +14,31 @@
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Pager",
+"Contact" => "Kontakt",
 "Add Contact" => "Kontakt bäisetzen",
+"Addressbooks" => "Adressbicher ",
+"New Address Book" => "Neit Adressbuch",
+"CardDav Link" => "CardDav Link",
+"Download" => "Download",
 "Edit" => "Editéieren",
 "Delete" => "Läschen",
+"Delete contact" => "Kontakt läschen",
 "Birthday" => "Gebuertsdag",
 "Phone" => "Telefon",
+"Type" => "Typ",
 "PO Box" => "Postleetzuel",
 "Extended" => "Erweidert",
 "Street" => "Strooss",
 "City" => "Staat",
 "Region" => "Regioun",
 "Zipcode" => "Postleetzuel",
-"Country" => "Land"
+"Country" => "Land",
+"Add" => "Dobäisetzen",
+"Addressbook" => "Adressbuch",
+"New Addressbook" => "Neit Adressbuch",
+"Edit Addressbook" => "Adressbuch editéieren",
+"Displayname" => "Ugewisene Numm",
+"Save" => "Späicheren",
+"Submit" => "Fortschécken",
+"Cancel" => "Ofbriechen"
 );
diff --git a/apps/contacts/l10n/mk.php b/apps/contacts/l10n/mk.php
index 4e9b2cc0d7..2b81a5d877 100644
--- a/apps/contacts/l10n/mk.php
+++ b/apps/contacts/l10n/mk.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Грешки при додавање на адресарот.",
 "Error activating addressbook." => "Грешка при активирање на адресарот.",
 "No contact ID was submitted." => "Не беше доставено ИД за контакт.",
-"Error loading image." => "Грешка во вчитување на слика.",
 "Error reading contact photo." => "Грешка во читање на контакт фотографија.",
 "Error saving temporary file." => "Грешка во снимање на привремена датотека.",
 "The loading photo is not valid." => "Фотографијата која се вчитува е невалидна.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Недостасува ид за контакт.",
 "No photo path was submitted." => "Не беше поднесена патека за фотографија.",
 "File doesn't exist:" => "Не постои датотеката:",
+"Error loading image." => "Грешка во вчитување на слика.",
 "element name is not set." => "име за елементот не е поставена.",
 "checksum is not set." => "сумата за проверка не е поставена.",
 "Information about vCard is incorrect. Please reload the page: " => "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава:",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Не беше подигната датотека.",
 "Missing a temporary folder" => "Недостасува привремена папка",
 "Contacts" => "Контакти",
+"Drop a VCF file to import contacts." => "Довлечкај VCF датотека да се внесат контакти.",
 "Addressbook not found." => "Адресарот не е најден.",
 "This is not your addressbook." => "Ова не е во Вашиот адресар.",
 "Contact could not be found." => "Контактот неможе да биде најден.",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "Име на новиот адресар",
 "Import" => "Внеси",
 "Importing contacts" => "Внесување контакти",
-"Contacts imported successfully" => "Контаките беа внесени успешно",
-"Close Dialog" => "Дијалог за затварање",
-"Import Addressbook" => "Внеси адресар",
 "Select address book to import to:" => "Изберете адресар да се внесе:",
-"Drop a VCF file to import contacts." => "Довлечкај VCF датотека да се внесат контакти.",
 "Select from HD" => "Изберете од хард диск",
 "You have no contacts in your addressbook." => "Немате контакти во Вашиот адресар.",
 "Add contact" => "Додади контакт",
diff --git a/apps/contacts/l10n/nb_NO.php b/apps/contacts/l10n/nb_NO.php
index 7b78456fef..3f7731bede 100644
--- a/apps/contacts/l10n/nb_NO.php
+++ b/apps/contacts/l10n/nb_NO.php
@@ -4,6 +4,7 @@
 "Cannot add empty property." => "Kan ikke legge til tomt felt.",
 "At least one of the address fields has to be filled out." => "Minst en av adressefeltene må oppgis.",
 "Error adding contact property." => "Et problem oppsto med å legge til kontaktfeltet.",
+"No ID provided" => "Ingen ID angitt",
 "No categories selected for deletion." => "Ingen kategorier valgt for sletting.",
 "No address books found." => "Ingen adressebok funnet.",
 "No contacts found." => "Ingen kontakter funnet.",
@@ -11,14 +12,16 @@
 "Cannot add addressbook with an empty name." => "Kan ikke legge til en adressebok uten navn.",
 "Error adding addressbook." => "Et problem oppsto med å legge til adresseboken.",
 "Error activating addressbook." => "Et problem oppsto med å aktivere adresseboken.",
-"Error loading image." => "Klarte ikke å laste bilde.",
 "Error reading contact photo." => "Klarte ikke å lese kontaktbilde.",
 "Error saving temporary file." => "Klarte ikke å lagre midlertidig fil.",
+"The loading photo is not valid." => "Bildet som lastes inn er ikke gyldig.",
+"id is not set." => "id er ikke satt.",
 "Information about vCard is incorrect. Please reload the page." => "Informasjonen om vCard-filen er ikke riktig. Last inn siden på nytt.",
 "Error deleting contact property." => "Et problem oppsto med å fjerne kontaktfeltet.",
 "Missing contact id." => "Mangler kontakt-id.",
 "No photo path was submitted." => "Ingen filsti ble lagt inn.",
 "File doesn't exist:" => "Filen eksisterer ikke:",
+"Error loading image." => "Klarte ikke å laste bilde.",
 "Something went FUBAR. " => "Noe gikk fryktelig galt.",
 "Error updating contact property." => "Et problem oppsto med å legge til kontaktfeltet.",
 "Cannot update addressbook with an empty name." => "Kan ikke oppdatere adressebøker uten navn.",
@@ -70,7 +73,9 @@
 "Separate groups with commas" => "Skill gruppene med komma",
 "Edit groups" => "Endre grupper",
 "Preferred" => "Foretrukket",
+"Please specify a valid email address." => "Vennligst angi en gyldig e-postadresse.",
 "Enter email address" => "Skriv inn e-postadresse",
+"Mail to address" => "Send e-post til adresse",
 "Delete email address" => "Fjern e-postadresse",
 "Enter phone number" => "Skriv inn telefonnummer",
 "Delete phone number" => "Fjern telefonnummer",
@@ -80,6 +85,7 @@
 "Add field" => "Legg til felt",
 "Profile picture" => "Profilbilde",
 "Phone" => "Telefon",
+"Note" => "Notat",
 "Delete current photo" => "Fjern nåværende bilde",
 "Edit current photo" => "Rediger nåværende bilde",
 "Upload new photo" => "Last opp nytt bilde",
@@ -104,6 +110,7 @@
 "Additional names" => "Ev. mellomnavn",
 "Family name" => "Etternavn",
 "Hon. suffixes" => "Titler",
+"Ph.D." => "Stipendiat",
 "Jr." => "Jr.",
 "Sn." => "Sr.",
 "New Addressbook" => "Ny adressebok",
@@ -111,7 +118,7 @@
 "Displayname" => "Visningsnavn",
 "Active" => "Aktiv",
 "Save" => "Lagre",
-"Submit" => "Send inn",
+"Submit" => "Lagre",
 "Cancel" => "Avbryt",
 "Import a contacts file" => "Importer en fil med kontakter.",
 "Please choose the addressbook" => "Vennligst velg adressebok",
@@ -119,9 +126,10 @@
 "Name of new addressbook" => "Navn på ny adressebok",
 "Import" => "Importer",
 "Importing contacts" => "Importerer kontakter",
-"Contacts imported successfully" => "Kontaktene ble importert uten feil",
-"Close Dialog" => "Lukk dialog",
-"Import Addressbook" => "Importer adressebok",
+"You have no contacts in your addressbook." => "Du har ingen kontakter i din adressebok",
 "Add contact" => "Ny kontakt",
-"more info" => "mer info"
+"Configure addressbooks" => "Konfigurer adressebøker",
+"CardDAV syncing addresses" => "Synkroniseringsadresse for CardDAV",
+"more info" => "mer info",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/nl.php b/apps/contacts/l10n/nl.php
index f0b603e583..fd7e50ba4d 100644
--- a/apps/contacts/l10n/nl.php
+++ b/apps/contacts/l10n/nl.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Fout bij het toevoegen van het adresboek.",
 "Error activating addressbook." => "Fout bij het activeren van het adresboek.",
 "No contact ID was submitted." => "Geen contact ID opgestuurd.",
-"Error loading image." => "Fout bij laden plaatje.",
 "Error reading contact photo." => "Lezen van contact foto mislukt.",
 "Error saving temporary file." => "Tijdelijk bestand opslaan mislukt.",
 "The loading photo is not valid." => "De geladen foto is niet goed.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Ontbrekende contact id.",
 "No photo path was submitted." => "Geen fotopad opgestuurd.",
 "File doesn't exist:" => "Bestand bestaat niet:",
+"Error loading image." => "Fout bij laden plaatje.",
 "element name is not set." => "onderdeel naam is niet opgegeven.",
 "checksum is not set." => "controlegetal is niet opgegeven.",
 "Information about vCard is incorrect. Please reload the page: " => "Informatie over vCard is fout. Herlaad de pagina: ",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Er is geen bestand geüpload",
 "Missing a temporary folder" => "Er ontbreekt een tijdelijke map",
 "Contacts" => "Contacten",
+"Drop a VCF file to import contacts." => "Sleep een VCF bestand om de contacten te importeren.",
 "Addressbook not found." => "Adresboek niet gevonden.",
 "This is not your addressbook." => "Dit is niet uw adresboek.",
 "Contact could not be found." => "Contact kon niet worden gevonden.",
@@ -129,11 +130,7 @@
 "Name of new addressbook" => "Naam van nieuw adresboek",
 "Import" => "Importeer",
 "Importing contacts" => "Importeren van contacten",
-"Contacts imported successfully" => "Contacten zijn geïmporteerd",
-"Close Dialog" => "Sluit venster",
-"Import Addressbook" => "Importeer adresboek",
 "Select address book to import to:" => "Selecteer adresboek voor import:",
-"Drop a VCF file to import contacts." => "Sleep een VCF bestand om de contacten te importeren.",
 "Select from HD" => "Selecteer van schijf",
 "You have no contacts in your addressbook." => "Je hebt geen contacten in je adresboek",
 "Add contact" => "Contactpersoon toevoegen",
diff --git a/apps/contacts/l10n/pl.php b/apps/contacts/l10n/pl.php
index 31d0689359..a99f190695 100644
--- a/apps/contacts/l10n/pl.php
+++ b/apps/contacts/l10n/pl.php
@@ -3,15 +3,48 @@
 "There was an error adding the contact." => "Wystąpił błąd podczas dodawania kontaktu.",
 "Cannot add empty property." => "Nie można dodać pustego elementu.",
 "At least one of the address fields has to be filled out." => "Należy wypełnić przynajmniej jedno pole adresu.",
+"Trying to add duplicate property: " => "Próba dodania z duplikowanej właściwości:",
 "Error adding contact property." => "Błąd dodawania elementu.",
+"No ID provided" => "Brak opatrzonego ID ",
+"Error setting checksum." => "Błąd ustawień sumy kontrolnej",
+"No categories selected for deletion." => "Nie zaznaczono kategorii do usunięcia",
+"No address books found." => "Nie znaleziono książek adresowych",
+"No contacts found." => "Nie znaleziono kontaktów.",
+"Missing ID" => "Brak ID",
+"Error parsing VCard for ID: \"" => "Wystąpił błąd podczas przetwarzania VCard ID: \"",
+"Cannot add addressbook with an empty name." => "Nie można dodać książki adresowej z pusta nazwą",
 "Error adding addressbook." => "Błąd dodawania książki adresowej.",
 "Error activating addressbook." => "Błąd aktywowania książki adresowej.",
+"No contact ID was submitted." => "ID kontaktu nie został utworzony.",
+"Error reading contact photo." => "Błąd odczytu zdjęcia kontaktu.",
+"Error saving temporary file." => "Wystąpił błąd podczas zapisywania pliku tymczasowego.",
+"The loading photo is not valid." => "Wczytywane zdjęcie nie jest poprawne.",
+"id is not set." => "id nie ustawione.",
 "Information about vCard is incorrect. Please reload the page." => "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę.",
 "Error deleting contact property." => "Błąd usuwania elementu.",
+"Contact ID is missing." => "Brak kontaktu id.",
+"Missing contact id." => "Brak kontaktu id.",
+"No photo path was submitted." => "Ścieżka do zdjęcia nie została podana.",
+"File doesn't exist:" => "Plik nie istnieje:",
+"Error loading image." => "Błąd ładowania obrazu.",
+"element name is not set." => "nazwa elementu nie jest ustawiona.",
+"checksum is not set." => "checksum-a nie ustawiona",
+"Information about vCard is incorrect. Please reload the page: " => "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:",
+"Something went FUBAR. " => "Gdyby coś poszło FUBAR.",
 "Error updating contact property." => "Błąd uaktualniania elementu.",
+"Cannot update addressbook with an empty name." => "Nie można zaktualizować książki adresowej z pustą nazwą.",
 "Error updating addressbook." => "Błąd uaktualniania książki adresowej.",
+"Error uploading contacts to storage." => "Wystąpił błąd podczas wysyłania kontaktów do magazynu.",
+"There is no error, the file uploaded with success" => "Nie było błędów, plik wyczytano poprawnie.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Załadowany plik przekracza wielkość upload_max_filesize w php.ini ",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Wczytywany plik przekracza wielkość MAX_FILE_SIZE, która została określona w formularzu HTML",
+"The uploaded file was only partially uploaded" => "Załadowany plik tylko częściowo został wysłany.",
+"No file was uploaded" => "Plik nie został załadowany",
+"Missing a temporary folder" => "Brak folderu tymczasowego",
 "Contacts" => "Kontakty",
-"This is not your addressbook." => "To nie jest twoja książka adresowa.",
+"Drop a VCF file to import contacts." => "Upuść plik VCF do importu kontaktów.",
+"Addressbook not found." => "Nie znaleziono książki adresowej",
+"This is not your addressbook." => "To nie jest Twoja książka adresowa.",
 "Contact could not be found." => "Nie można odnaleźć kontaktu.",
 "Address" => "Adres",
 "Telephone" => "Telefon",
@@ -22,22 +55,53 @@
 "Mobile" => "Komórka",
 "Text" => "Połączenie tekstowe",
 "Voice" => "Połączenie głosowe",
+"Message" => "Wiadomość",
 "Fax" => "Faks",
 "Video" => "Połączenie wideo",
 "Pager" => "Pager",
+"Internet" => "Internet",
+"{name}'s Birthday" => "{name} Urodzony",
 "Contact" => "Kontakt",
 "Add Contact" => "Dodaj kontakt",
 "Addressbooks" => "Książki adresowe",
+"Configure Address Books" => "Konfiguruj książkę adresową",
 "New Address Book" => "Nowa książka adresowa",
+"Import from VCF" => "Importuj z VFC",
 "CardDav Link" => "Wyświetla odnośnik CardDav",
 "Download" => "Pobiera książkę adresową",
 "Edit" => "Edytuje książkę adresową",
 "Delete" => "Usuwa książkę adresową",
 "Download contact" => "Pobiera kontakt",
 "Delete contact" => "Usuwa kontakt",
+"Drop photo to upload" => "Upuść fotografię aby załadować",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format niestandardowy, krótkie nazwy, imię i nazwisko, Odwracać lub Odwrócić z przecinkiem",
+"Edit name details" => "Edytuj szczegóły nazwy",
+"Nickname" => "Nazwa",
+"Enter nickname" => "Wpisz nazwę",
 "Birthday" => "Urodziny",
+"dd-mm-yyyy" => "dd-mm-rrrr",
+"Groups" => "Grupy",
+"Separate groups with commas" => "Oddziel grupy przecinkami",
+"Edit groups" => "Edytuj grupy",
 "Preferred" => "Preferowane",
+"Please specify a valid email address." => "Określ prawidłowy adres e-mail.",
+"Enter email address" => "Wpisz adres email",
+"Mail to address" => "Mail na adres",
+"Delete email address" => "Usuń adres mailowy",
+"Enter phone number" => "Wpisz numer telefonu",
+"Delete phone number" => "Usuń numer telefonu",
+"View on map" => "Zobacz na mapie",
+"Edit address details" => "Edytuj szczegóły adresu",
+"Add notes here." => "Dodaj notatkę tutaj.",
+"Add field" => "Dodaj pole",
+"Profile picture" => "Zdjęcie profilu",
 "Phone" => "Telefon",
+"Note" => "Uwaga",
+"Delete current photo" => "Usuń aktualne zdjęcie",
+"Edit current photo" => "Edytuj aktualne zdjęcie",
+"Upload new photo" => "Wczytaj nowe zdjęcie",
+"Select photo from ownCloud" => "Wybierz zdjęcie z ownCloud",
+"Edit address" => "Edytuj adres",
 "Type" => "Typ",
 "PO Box" => "Skrzynka pocztowa",
 "Extended" => "Rozszerzony",
@@ -46,13 +110,48 @@
 "Region" => "Region",
 "Zipcode" => "Kod pocztowy",
 "Country" => "Kraj",
+"Edit categories" => "Edytuj kategorie",
 "Add" => "Dodaj",
 "Addressbook" => "Książka adresowa",
+"Hon. prefixes" => "Prefiksy Hon.",
+"Miss" => "Panna",
+"Ms" => "Ms",
+"Mr" => "Pan",
+"Sir" => "Sir",
+"Mrs" => "Pani",
+"Dr" => "Dr",
+"Given name" => "Podaj imię",
+"Additional names" => "Dodatkowe nazwy",
+"Family name" => "Nazwa rodziny",
+"Hon. suffixes" => "Sufiksy Hon.",
+"J.D." => "J.D.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
 "New Addressbook" => "Nowa książka adresowa",
 "Edit Addressbook" => "Edytowanie książki adresowej",
 "Displayname" => "Wyświetlana nazwa",
 "Active" => "Aktywna",
 "Save" => "Zapisz",
 "Submit" => "Potwierdź",
-"Cancel" => "Anuluj"
+"Cancel" => "Anuluj",
+"Import a contacts file" => "Importuj plik z kontaktami",
+"Please choose the addressbook" => "Proszę wybrać książkę adresową",
+"create a new addressbook" => "utwórz nową książkę adresową",
+"Name of new addressbook" => "Nazwa nowej książki adresowej",
+"Import" => "Import",
+"Importing contacts" => "importuj kontakty",
+"Select address book to import to:" => "Zaznacz książkę adresową do importu do:",
+"Select from HD" => "Wybierz z HD",
+"You have no contacts in your addressbook." => "Nie masz żadnych kontaktów w swojej książce adresowej.",
+"Add contact" => "Dodaj kontakt",
+"Configure addressbooks" => "Konfiguruj książkę adresową",
+"CardDAV syncing addresses" => "adres do synchronizacji CardDAV",
+"more info" => "więcej informacji",
+"Primary address (Kontact et al)" => "Pierwszy adres",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/pt_BR.php b/apps/contacts/l10n/pt_BR.php
index 7890ebf0b7..e0da0a771a 100644
--- a/apps/contacts/l10n/pt_BR.php
+++ b/apps/contacts/l10n/pt_BR.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Erro ao adicionar agenda.",
 "Error activating addressbook." => "Erro ao ativar agenda.",
 "No contact ID was submitted." => "Nenhum ID do contato foi submetido.",
-"Error loading image." => "Erro ao carregar imagem.",
 "Error reading contact photo." => "Erro de leitura na foto do contato.",
 "Error saving temporary file." => "Erro ao salvar arquivo temporário.",
 "The loading photo is not valid." => "Foto carregada não é válida.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Faltando ID do contato.",
 "No photo path was submitted." => "Nenhum caminho para foto foi submetido.",
 "File doesn't exist:" => "Arquivo não existe:",
+"Error loading image." => "Erro ao carregar imagem.",
 "element name is not set." => "nome do elemento não definido.",
 "checksum is not set." => "checksum não definido.",
 "Information about vCard is incorrect. Please reload the page: " => "Informação sobre vCard incorreto. Por favor, recarregue a página:",
@@ -37,7 +37,13 @@
 "Error uploading contacts to storage." => "Erro enviando contatos para armazenamento.",
 "There is no error, the file uploaded with success" => "Arquivo enviado com sucesso",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O arquivo enviado excede a diretiva upload_max_filesize em php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O arquivo carregado excede o argumento MAX_FILE_SIZE especificado no formulário HTML",
+"The uploaded file was only partially uploaded" => "O arquivo foi parcialmente carregado",
+"No file was uploaded" => "Nenhum arquivo carregado",
+"Missing a temporary folder" => "Diretório temporário não encontrado",
 "Contacts" => "Contatos",
+"Drop a VCF file to import contacts." => "Arraste um arquivo VCF para importar contatos.",
+"Addressbook not found." => "Lista de endereços não encontrado.",
 "This is not your addressbook." => "Esta não é a sua agenda de endereços.",
 "Contact could not be found." => "Contato não pôde ser encontrado.",
 "Address" => "Endereço",
@@ -49,22 +55,53 @@
 "Mobile" => "Móvel",
 "Text" => "Texto",
 "Voice" => "Voz",
+"Message" => "Mensagem",
 "Fax" => "Fax",
 "Video" => "Vídeo",
 "Pager" => "Pager",
+"Internet" => "Internet",
+"{name}'s Birthday" => "Aniversário de {name}",
 "Contact" => "Contato",
 "Add Contact" => "Adicionar Contato",
-"Addressbooks" => "Agendas",
+"Addressbooks" => "Agendas de Endereço",
+"Configure Address Books" => "Configurar Livro de Endereços",
 "New Address Book" => "Nova agenda",
+"Import from VCF" => "Importar de VCF",
 "CardDav Link" => "Link CardDav",
 "Download" => "Baixar",
 "Edit" => "Editar",
 "Delete" => "Excluir",
 "Download contact" => "Baixar contato",
 "Delete contact" => "Apagar contato",
+"Drop photo to upload" => "Arraste a foto para ser carregada",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizado, Nome curto, Nome completo, Inverter ou Inverter com vírgula",
+"Edit name details" => "Editar detalhes do nome",
+"Nickname" => "Apelido",
+"Enter nickname" => "Digite o apelido",
 "Birthday" => "Aniversário",
+"dd-mm-yyyy" => "dd-mm-aaaa",
+"Groups" => "Grupos",
+"Separate groups with commas" => "Separe grupos por virgula",
+"Edit groups" => "Editar grupos",
 "Preferred" => "Preferido",
+"Please specify a valid email address." => "Por favor, especifique um email válido.",
+"Enter email address" => "Digite um endereço de email",
+"Mail to address" => "Correio para endereço",
+"Delete email address" => "Remover endereço de email",
+"Enter phone number" => "Digite um número de telefone",
+"Delete phone number" => "Remover número de telefone",
+"View on map" => "Visualizar no mapa",
+"Edit address details" => "Editar detalhes de endereço",
+"Add notes here." => "Adicionar notas",
+"Add field" => "Adicionar campo",
+"Profile picture" => "Imagem do Perfil",
 "Phone" => "Telefone",
+"Note" => "Nota",
+"Delete current photo" => "Deletar imagem atual",
+"Edit current photo" => "Editar imagem atual",
+"Upload new photo" => "Carregar nova foto",
+"Select photo from ownCloud" => "Selecionar foto do OwnCloud",
+"Edit address" => "Editar endereço",
 "Type" => "Digite",
 "PO Box" => "Caixa Postal",
 "Extended" => "Estendido",
@@ -73,13 +110,48 @@
 "Region" => "Região",
 "Zipcode" => "CEP",
 "Country" => "País",
+"Edit categories" => "Editar categorias",
 "Add" => "Adicionar",
-"Addressbook" => "Agenda",
-"New Addressbook" => "Nova agenda",
-"Edit Addressbook" => "Editar agenda",
+"Addressbook" => "Agenda de Endereço",
+"Hon. prefixes" => "Exmo. Prefixos ",
+"Miss" => "Senhorita",
+"Ms" => "Srta.",
+"Mr" => "Sr.",
+"Sir" => "Senhor",
+"Mrs" => "Sra.",
+"Dr" => "Dr",
+"Given name" => "Primeiro Nome",
+"Additional names" => "Segundo Nome",
+"Family name" => "Sobrenome",
+"Hon. suffixes" => "Exmo. Sufixos",
+"J.D." => "J.D.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
+"New Addressbook" => "Nova Agenda de Endereço",
+"Edit Addressbook" => "Editar Agenda de Endereço",
 "Displayname" => "Nome de exibição",
 "Active" => "Ativo",
 "Save" => "Salvar",
 "Submit" => "Enviar",
-"Cancel" => "Cancelar"
+"Cancel" => "Cancelar",
+"Import a contacts file" => "Importar arquivos de contato.",
+"Please choose the addressbook" => "Por favor, selecione uma agenda de endereços",
+"create a new addressbook" => "Criar nova agenda de endereços",
+"Name of new addressbook" => "Nome da nova agenda de endereços",
+"Import" => "Importar",
+"Importing contacts" => "Importar contatos",
+"Select address book to import to:" => "Selecione agenda de endereços para importar ao destino:",
+"Select from HD" => "Selecione do disco rigído",
+"You have no contacts in your addressbook." => "Voce não tem contatos em sua agenda de endereços.",
+"Add contact" => "Adicionar contatos",
+"Configure addressbooks" => "Configurar agenda de endereços",
+"CardDAV syncing addresses" => "Sincronizando endereços CardDAV",
+"more info" => "leia mais",
+"Primary address (Kontact et al)" => "Endereço primário(Kontact et al)",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/pt_PT.php b/apps/contacts/l10n/pt_PT.php
index 82a2a9f0ff..7a4861abf9 100644
--- a/apps/contacts/l10n/pt_PT.php
+++ b/apps/contacts/l10n/pt_PT.php
@@ -3,14 +3,42 @@
 "There was an error adding the contact." => "Erro ao adicionar contato",
 "Cannot add empty property." => "Não é possivel adicionar uma propriedade vazia",
 "At least one of the address fields has to be filled out." => "Pelo menos um dos campos de endereço precisa de estar preenchido",
+"Trying to add duplicate property: " => "A tentar adicionar propriedade duplicada: ",
 "Error adding contact property." => "Erro ao adicionar propriedade do contato",
+"No ID provided" => "Nenhum ID inserido",
+"Error setting checksum." => "Erro a definir checksum.",
+"No categories selected for deletion." => "Nenhuma categoria selecionada para eliminar.",
+"No address books found." => "Nenhum livro de endereços encontrado.",
+"No contacts found." => "Nenhum contacto encontrado.",
+"Missing ID" => "Falta ID",
+"Error parsing VCard for ID: \"" => "Erro a analisar VCard para o ID: \"",
+"Cannot add addressbook with an empty name." => "Não é possivel adicionar Livro de endereços com nome vazio.",
 "Error adding addressbook." => "Erro ao adicionar livro de endereços",
 "Error activating addressbook." => "Erro ao ativar livro de endereços",
+"No contact ID was submitted." => "Nenhum ID de contacto definido.",
+"Error reading contact photo." => "Erro a ler a foto do contacto.",
+"Error saving temporary file." => "Erro a guardar ficheiro temporário.",
+"The loading photo is not valid." => "A foto carregada não é valida.",
+"id is not set." => "id não está definido",
 "Information about vCard is incorrect. Please reload the page." => "A informação sobre o vCard está incorreta. Por favor refresque a página",
 "Error deleting contact property." => "Erro ao apagar propriedade do contato",
+"Contact ID is missing." => "Falta o ID do contacto.",
+"Missing contact id." => "Falta o ID do contacto.",
+"No photo path was submitted." => "Nenhum caminho da foto definido.",
+"File doesn't exist:" => "O ficheiro não existe:",
+"Error loading image." => "Erro a carregar a imagem.",
+"element name is not set." => "o nome do elemento não está definido.",
+"checksum is not set." => "Checksum não está definido.",
+"Information about vCard is incorrect. Please reload the page: " => "A informação sobre o VCard está incorrecta. Por favor refresque a página: ",
+"Something went FUBAR. " => "Algo provocou um FUBAR. ",
 "Error updating contact property." => "Erro ao atualizar propriedade do contato",
+"Cannot update addressbook with an empty name." => "Não é possivel actualizar o livro de endereços com o nome vazio.",
 "Error updating addressbook." => "Erro a atualizar o livro de endereços",
+"Error uploading contacts to storage." => "Erro a carregar os contactos para o armazenamento.",
+"There is no error, the file uploaded with success" => "Não ocorreu erros, o ficheiro foi submetido com sucesso",
+"No file was uploaded" => "Nenhum ficheiro foi submetido",
 "Contacts" => "Contactos",
+"Addressbook not found." => "Livro de endereços não encontrado.",
 "This is not your addressbook." => "Esta não é a sua lista de contactos",
 "Contact could not be found." => "O contacto não foi encontrado",
 "Address" => "Morada",
@@ -22,22 +50,50 @@
 "Mobile" => "Telemovel",
 "Text" => "Texto",
 "Voice" => "Voz",
+"Message" => "Mensagem",
 "Fax" => "Fax",
 "Video" => "Vídeo",
 "Pager" => "Pager",
+"Internet" => "Internet",
+"{name}'s Birthday" => "Aniversário de {name}",
 "Contact" => "Contacto",
 "Add Contact" => "Adicionar Contacto",
 "Addressbooks" => "Livros de endereços",
+"Configure Address Books" => "Configurar livros de endereços",
 "New Address Book" => "Novo livro de endereços",
+"Import from VCF" => "Importar de VCF",
 "CardDav Link" => "Endereço CardDav",
 "Download" => "Transferir",
 "Edit" => "Editar",
 "Delete" => "Apagar",
 "Download contact" => "Transferir contacto",
 "Delete contact" => "Apagar contato",
+"Edit name details" => "Editar detalhes do nome",
+"Nickname" => "Alcunha",
+"Enter nickname" => "Introduza alcunha",
 "Birthday" => "Aniversário",
+"dd-mm-yyyy" => "dd-mm-aaaa",
+"Groups" => "Grupos",
+"Separate groups with commas" => "Separe os grupos usando virgulas",
+"Edit groups" => "Editar grupos",
 "Preferred" => "Preferido",
+"Please specify a valid email address." => "Por favor indique um endereço de correio válido",
+"Enter email address" => "Introduza endereço de email",
+"Mail to address" => "Enviar correio para o endereço",
+"Delete email address" => "Eliminar o endereço de correio",
+"Enter phone number" => "Insira o número de telefone",
+"Delete phone number" => "Eliminar o número de telefone",
+"View on map" => "Ver no mapa",
+"Edit address details" => "Editar os detalhes do endereço",
+"Add notes here." => "Insira notas aqui.",
+"Add field" => "Adicionar campo",
+"Profile picture" => "Foto do perfil",
 "Phone" => "Telefone",
+"Note" => "Nota",
+"Delete current photo" => "Eliminar a foto actual",
+"Edit current photo" => "Editar a foto actual",
+"Select photo from ownCloud" => "Selecionar uma foto da ownCloud",
+"Edit address" => "Editar endereço",
 "Type" => "Tipo",
 "PO Box" => "Apartado",
 "Extended" => "Extendido",
@@ -46,13 +102,28 @@
 "Region" => "Região",
 "Zipcode" => "Código Postal",
 "Country" => "País",
+"Edit categories" => "Editar categorias",
 "Add" => "Adicionar",
 "Addressbook" => "Livro de endereços",
+"Ms" => "Sra",
+"Mr" => "Sr",
+"Sir" => "Sr",
+"Dr" => "Dr",
+"Additional names" => "Nomes adicionais",
+"Family name" => "Nome de familia",
 "New Addressbook" => "Novo livro de endereços",
 "Edit Addressbook" => "Editar livro de endereços",
 "Displayname" => "Nome de exibição",
 "Active" => "Ativo",
 "Save" => "Guardar",
 "Submit" => "Submeter",
-"Cancel" => "Cancelar"
+"Cancel" => "Cancelar",
+"Import a contacts file" => "Importar um ficheiro de contactos",
+"Please choose the addressbook" => "Por favor seleccione o livro de endereços",
+"create a new addressbook" => "Criar um novo livro de endereços",
+"Import" => "Importar",
+"Importing contacts" => "A importar os contactos",
+"Add contact" => "Adicionar contacto",
+"more info" => "mais informação",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/ro.php b/apps/contacts/l10n/ro.php
index a62cd6b24e..0160975671 100644
--- a/apps/contacts/l10n/ro.php
+++ b/apps/contacts/l10n/ro.php
@@ -4,10 +4,30 @@
 "Cannot add empty property." => "Nu se poate adăuga un câmp gol.",
 "At least one of the address fields has to be filled out." => "Cel puțin unul din câmpurile adresei trebuie completat.",
 "Error adding contact property." => "Contactul nu a putut fi adăugat.",
+"No ID provided" => "Nici un ID nu a fost furnizat",
+"Error setting checksum." => "Eroare la stabilirea sumei de control",
+"No categories selected for deletion." => "Nici o categorie selectată pentru ștergere",
+"No address books found." => "Nici o carte de adrese găsită",
+"No contacts found." => "Nici un contact găsit",
+"Missing ID" => "ID lipsă",
+"Error parsing VCard for ID: \"" => "Eroare la prelucrarea VCard-ului pentru ID:\"",
+"Cannot add addressbook with an empty name." => "Nu e posibil de adăugat o carte de adrese fără nume",
 "Error adding addressbook." => "Agenda nu a putut fi adăugată.",
 "Error activating addressbook." => "Eroare la activarea agendei.",
+"No contact ID was submitted." => "Nici un ID de contact nu a fost transmis",
+"Error reading contact photo." => "Eroare la citerea fotografiei de contact",
+"Error saving temporary file." => "Eroare la salvarea fișierului temporar.",
+"The loading photo is not valid." => "Fotografia care se încarcă nu este validă.",
+"id is not set." => "ID-ul nu este stabilit",
 "Information about vCard is incorrect. Please reload the page." => "Informațiile cărții de vizită sunt incorecte. Te rog reîncarcă pagina.",
 "Error deleting contact property." => "Eroare la ștergerea proprietăților contactului.",
+"Contact ID is missing." => "ID-ul de contact lipsește.",
+"Missing contact id." => "ID de contact lipsă.",
+"No photo path was submitted." => "Nici o adresă către fotografie nu a fost transmisă",
+"File doesn't exist:" => "Fișierul nu există:",
+"Error loading image." => "Eroare la încărcarea imaginii.",
+"element name is not set." => "numele elementului nu este stabilit.",
+"checksum is not set." => "suma de control nu este stabilită.",
 "Error updating contact property." => "Eroare la actualizarea proprietăților contactului.",
 "Error updating addressbook." => "Eroare la actualizarea agendei.",
 "Contacts" => "Contacte",
@@ -22,9 +42,12 @@
 "Mobile" => "Mobil",
 "Text" => "Text",
 "Voice" => "Voce",
+"Message" => "Mesaj",
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Pager",
+"Internet" => "Internet",
+"{name}'s Birthday" => "Ziua de naștere a {name}",
 "Contact" => "Contact",
 "Add Contact" => "Adaugă contact",
 "Addressbooks" => "Agende",
@@ -35,8 +58,19 @@
 "Delete" => "Șterge",
 "Download contact" => "Descarcă acest contact",
 "Delete contact" => "Șterge contact",
+"Edit name details" => "Introdu detalii despre nume",
+"Nickname" => "Pseudonim",
+"Enter nickname" => "Introdu pseudonim",
 "Birthday" => "Zi de naștere",
+"dd-mm-yyyy" => "zz-ll-aaaa",
+"Groups" => "Grupuri",
+"Separate groups with commas" => "Separă grupurile cu virgule",
+"Edit groups" => "Editează grupuri",
 "Preferred" => "Preferat",
+"Please specify a valid email address." => "Te rog să specifici un e-mail corect",
+"Enter email address" => "Introdu adresa de e-mail",
+"Mail to address" => "Trimite mesaj la e-mail",
+"Delete email address" => "Șterge e-mail",
 "Phone" => "Telefon",
 "Type" => "Tip",
 "PO Box" => "CP",
diff --git a/apps/contacts/l10n/ru.php b/apps/contacts/l10n/ru.php
index 62e595c3c2..01a0e2642b 100644
--- a/apps/contacts/l10n/ru.php
+++ b/apps/contacts/l10n/ru.php
@@ -4,13 +4,40 @@
 "Cannot add empty property." => "Невозможно добавить пустой параметр.",
 "At least one of the address fields has to be filled out." => "Как минимум одно поле адреса должно быть заполнено.",
 "Error adding contact property." => "Ошибка добавления информации к контакту.",
+"No ID provided" => "ID не предоставлен",
+"Error setting checksum." => "Ошибка установки контрольной суммы.",
+"No categories selected for deletion." => "Категории для удаления не установлены.",
+"No address books found." => "Адресные книги не найдены.",
+"No contacts found." => "Контакты не найдены.",
+"Missing ID" => "Отсутствует ID",
+"Error parsing VCard for ID: \"" => "Ошибка обработки VCard для ID: \"",
+"Cannot add addressbook with an empty name." => "Нельзя добавить адресную книгу без имени.",
 "Error adding addressbook." => "Ошибка добавления адресной книги.",
 "Error activating addressbook." => "Ошибка активации адресной книги.",
+"Error reading contact photo." => "Ошибка чтения фотографии контакта.",
+"Error saving temporary file." => "Ошибка сохранения временного файла.",
+"The loading photo is not valid." => "Загружаемая фотография испорчена.",
+"id is not set." => "id не установлен.",
 "Information about vCard is incorrect. Please reload the page." => "Информация о vCard некорректна. Пожалуйста, обновите страницу.",
 "Error deleting contact property." => "Ошибка удаления информации из контакта.",
+"Contact ID is missing." => "ID контакта отсутствует.",
+"File doesn't exist:" => "Файл не существует:",
+"Error loading image." => "Ошибка загрузки картинки.",
+"element name is not set." => "имя элемента не установлено.",
+"checksum is not set." => "контрольная сумма не установлена.",
+"Information about vCard is incorrect. Please reload the page: " => "Информация о vCard не корректна. Перезагрузите страницу: ",
 "Error updating contact property." => "Ошибка обновления информации контакта.",
+"Cannot update addressbook with an empty name." => "Нельзя обновить адресную книгу с пустым именем.",
 "Error updating addressbook." => "Ошибка обновления адресной книги.",
+"Error uploading contacts to storage." => "Ошибка загрузки контактов в хранилище.",
+"There is no error, the file uploaded with success" => "Файл загружен успешно.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Загружаемый файл первосходит значение переменной upload_max_filesize, установленно в php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Загружаемый файл превосходит значение переменной MAX_FILE_SIZE, указанной в форме HTML",
+"The uploaded file was only partially uploaded" => "Файл загружен частично",
+"No file was uploaded" => "Файл не был загружен",
+"Missing a temporary folder" => "Отсутствует временная папка",
 "Contacts" => "Контакты",
+"Addressbook not found." => "Адресная книга не найдена.",
 "This is not your addressbook." => "Это не ваша адресная книга.",
 "Contact could not be found." => "Контакт не найден.",
 "Address" => "Адрес",
@@ -22,22 +49,50 @@
 "Mobile" => "Мобильный",
 "Text" => "Текст",
 "Voice" => "Голос",
+"Message" => "Сообщение",
 "Fax" => "Факс",
 "Video" => "Видео",
 "Pager" => "Пейджер",
+"Internet" => "Интернет",
+"{name}'s Birthday" => "День рождения {name}",
 "Contact" => "Контакт",
 "Add Contact" => "Добавить Контакт",
 "Addressbooks" => "Адресные книги",
+"Configure Address Books" => "Настроить Адресную книгу",
 "New Address Book" => "Новая адресная книга",
+"Import from VCF" => "Импортировать из VCF",
 "CardDav Link" => "Ссылка CardDAV",
 "Download" => "Скачать",
 "Edit" => "Редактировать",
 "Delete" => "Удалить",
 "Download contact" => "Скачать контакт",
 "Delete contact" => "Удалить контакт",
+"Drop photo to upload" => "Перетяните фотографии для загрузки",
+"Nickname" => "Псевдоним",
+"Enter nickname" => "Введите псевдоним",
 "Birthday" => "День рождения",
+"dd-mm-yyyy" => "dd-mm-yyyy",
+"Groups" => "Группы",
+"Edit groups" => "Редактировать группы",
 "Preferred" => "Предпочитаемый",
+"Please specify a valid email address." => "Укажите действительный адрес электронной почты.",
+"Enter email address" => "Укажите адрес электронной почты",
+"Mail to address" => "Написать по адресу",
+"Delete email address" => "Удалить адрес электронной почты",
+"Enter phone number" => "Ввести номер телефона",
+"Delete phone number" => "Удалить номер телефона",
+"View on map" => "Показать на карте",
+"Edit address details" => "Ввести детали адреса",
+"Add notes here." => "Добавьте заметки здесь.",
+"Add field" => "Добавить поле",
+"Profile picture" => "Фото профиля",
 "Phone" => "Телефон",
+"Note" => "Заметка",
+"Delete current photo" => "Удалить текущую фотографию",
+"Edit current photo" => "Редактировать текущую фотографию",
+"Upload new photo" => "Загрузить новую фотографию",
+"Select photo from ownCloud" => "Выбрать фотографию из ownCloud",
+"Edit address" => "Редактировать адрес",
 "Type" => "Тип",
 "PO Box" => "АО",
 "Extended" => "Расширенный",
@@ -46,13 +101,27 @@
 "Region" => "Область",
 "Zipcode" => "Почтовый индекс",
 "Country" => "Страна",
+"Edit categories" => "Редактировать категрии",
 "Add" => "Добавить",
 "Addressbook" => "Адресная книга",
+"Given name" => "Имя",
+"Additional names" => "Дополнительные имена (отчество)",
+"Family name" => "Фамилия",
 "New Addressbook" => "Новая адресная книга",
 "Edit Addressbook" => "Редактировать адресную книгу",
 "Displayname" => "Отображаемое имя",
 "Active" => "Активно",
 "Save" => "Сохранить",
 "Submit" => "Отправить",
-"Cancel" => "Отменить"
+"Cancel" => "Отменить",
+"Import a contacts file" => "Загрузить файл контактов",
+"Please choose the addressbook" => "Выберите адресную книгу",
+"create a new addressbook" => "создать новую адресную книгу",
+"Name of new addressbook" => "Имя новой адресной книги",
+"Import" => "Импорт",
+"Importing contacts" => "Импорт контактов",
+"You have no contacts in your addressbook." => "В адресной книге есть контакты.",
+"Add contact" => "Добавить контакт",
+"Configure addressbooks" => "Настроить адресную книгу",
+"more info" => "дополнительная информация"
 );
diff --git a/apps/contacts/l10n/sk_SK.php b/apps/contacts/l10n/sk_SK.php
index c43a7e7767..6e5ebe3bd3 100644
--- a/apps/contacts/l10n/sk_SK.php
+++ b/apps/contacts/l10n/sk_SK.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Chyba počas pridávania adresára.",
 "Error activating addressbook." => "Chyba aktivovania adresára.",
 "No contact ID was submitted." => "Nebolo nastavené ID kontaktu.",
-"Error loading image." => "Chyba pri nahrávaní obrázka.",
 "Error reading contact photo." => "Chyba pri čítaní fotky kontaktu.",
 "Error saving temporary file." => "Chyba pri ukladaní dočasného súboru.",
 "The loading photo is not valid." => "Načítaná fotka je vadná.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Chýba ID kontaktu.",
 "No photo path was submitted." => "Žiadna fotka nebola poslaná.",
 "File doesn't exist:" => "Súbor neexistuje:",
+"Error loading image." => "Chyba pri nahrávaní obrázka.",
 "element name is not set." => "meno elementu nie je nastavené.",
 "checksum is not set." => "kontrolný súčet nie je nastavený.",
 "Information about vCard is incorrect. Please reload the page: " => "Informácia o vCard je nesprávna. Obnovte stránku, prosím.",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Žiadny súbor nebol uložený",
 "Missing a temporary folder" => "Chýba dočasný priečinok",
 "Contacts" => "Kontakty",
+"Drop a VCF file to import contacts." => "Pretiahnite VCF súbor pre import kontaktov.",
 "Addressbook not found." => "Adresár sa nenašiel.",
 "This is not your addressbook." => "Toto nie je váš adresár.",
 "Contact could not be found." => "Kontakt nebol nájdený.",
@@ -142,11 +143,7 @@
 "Name of new addressbook" => "Meno nového adresára",
 "Import" => "Importovať",
 "Importing contacts" => "Importovanie kontaktov",
-"Contacts imported successfully" => "Kontakty úspešne importované",
-"Close Dialog" => "Zatvoriť ponuku",
-"Import Addressbook" => "Importovanie adresára",
 "Select address book to import to:" => "Vyberte adresár, do ktorého chcete importovať:",
-"Drop a VCF file to import contacts." => "Pretiahnite VCF súbor pre import kontaktov.",
 "Select from HD" => "Vyberte z pevného disku",
 "You have no contacts in your addressbook." => "Nemáte žiadne kontakty v adresári.",
 "Add contact" => "Pridať kontakt",
diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
index ceb26967e5..bfba23fabc 100644
--- a/apps/contacts/l10n/sl.php
+++ b/apps/contacts/l10n/sl.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Napaka pri dodajanju imenika.",
 "Error activating addressbook." => "Napaka pri aktiviranju imenika.",
 "No contact ID was submitted." => "ID stika ni bil poslan.",
-"Error loading image." => "Napaka pri nalaganju slike.",
 "Error reading contact photo." => "Napaka pri branju slike stika.",
 "Error saving temporary file." => "Napaka pri shranjevanju začasne datoteke.",
 "The loading photo is not valid." => "Slika, ki se nalaga ni veljavna.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Manjka id stika.",
 "No photo path was submitted." => "Pot slike ni bila poslana.",
 "File doesn't exist:" => "Datoteka ne obstaja:",
+"Error loading image." => "Napaka pri nalaganju slike.",
 "element name is not set." => "ime elementa ni nastavljeno.",
 "checksum is not set." => "nadzorna vsota ni nastavljena.",
 "Information about vCard is incorrect. Please reload the page: " => "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: ",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Nobena datoteka ni bila naložena",
 "Missing a temporary folder" => "Manjka začasna mapa",
 "Contacts" => "Stiki",
+"Drop a VCF file to import contacts." => "Za uvoz stikov spustite VCF datoteko tukaj.",
 "Addressbook not found." => "Imenik ni bil najden.",
 "This is not your addressbook." => "To ni vaš imenik.",
 "Contact could not be found." => "Stika ni bilo mogoče najti.",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "Ime novega imenika",
 "Import" => "Uvozi",
 "Importing contacts" => "Uvažam stike",
-"Contacts imported successfully" => "Stiki so bili uspešno uvoženi",
-"Close Dialog" => "Zapri dialog",
-"Import Addressbook" => "Uvozi imenik",
 "Select address book to import to:" => "Izberite imenik v katerega boste uvažali:",
-"Drop a VCF file to import contacts." => "Za uvoz stikov spustite VCF datoteko tukaj.",
 "Select from HD" => "Izberi iz HD",
 "You have no contacts in your addressbook." => "V vašem imeniku ni stikov.",
 "Add contact" => "Dodaj stik",
diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
index cee9682b84..8d5d37d248 100644
--- a/apps/contacts/l10n/sv.php
+++ b/apps/contacts/l10n/sv.php
@@ -4,13 +4,42 @@
 "Cannot add empty property." => "Kan inte lägga till en tom egenskap",
 "At least one of the address fields has to be filled out." => "Minst ett fält måste fyllas i",
 "Error adding contact property." => "Fel när kontaktegenskap skulle läggas till",
+"No ID provided" => "Inget ID angett",
+"Error setting checksum." => "Fel uppstod när kontrollsumma skulle sättas.",
+"No categories selected for deletion." => "Inga kategorier valda för borttaging",
+"No address books found." => "Ingen adressbok funnen.",
+"No contacts found." => "Inga kontakter funna.",
+"Missing ID" => "ID saknas",
+"Cannot add addressbook with an empty name." => "Kan inte lägga till adressbok med ett tomt namn.",
 "Error adding addressbook." => "Fel när adressbok skulle läggas till",
 "Error activating addressbook." => "Fel uppstod när adressbok skulle aktiveras",
+"No contact ID was submitted." => "Inget kontakt-ID angavs.",
+"Error reading contact photo." => "Fel uppstod när ",
+"Error saving temporary file." => "Fel uppstod när temporär fil skulle sparas.",
+"The loading photo is not valid." => "Det laddade fotot är inte giltigt.",
+"id is not set." => "ID är inte satt.",
 "Information about vCard is incorrect. Please reload the page." => "Information om vCard är felaktigt. Vänligen ladda om sidan.",
 "Error deleting contact property." => "Fel uppstod när kontaktegenskap skulle tas bort",
+"Contact ID is missing." => "Kontakt-ID saknas.",
+"Missing contact id." => "Saknar kontakt-ID.",
+"No photo path was submitted." => "Ingen sökväg till foto angavs.",
+"File doesn't exist:" => "Filen existerar inte.",
+"Error loading image." => "Fel uppstod när bild laddades.",
+"checksum is not set." => "kontrollsumma är inte satt.",
+"Information about vCard is incorrect. Please reload the page: " => "Informationen om vCard är fel. Ladda om sidan:",
 "Error updating contact property." => "Fel uppstod när kontaktegenskap skulle uppdateras",
+"Cannot update addressbook with an empty name." => "Kan inte uppdatera adressboken med ett tomt namn.",
 "Error updating addressbook." => "Fel uppstod när adressbok skulle uppdateras",
+"Error uploading contacts to storage." => "Fel uppstod när kontakt skulle lagras.",
+"There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den uppladdade filen överskrider upload_max_filesize direktivet i php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uppladdade filen överskrider MAX_FILE_SIZE direktivet som har angetts i HTML formuläret",
+"The uploaded file was only partially uploaded" => "Den uppladdade filen var bara delvist uppladdad",
+"No file was uploaded" => "Ingen fil laddades upp",
+"Missing a temporary folder" => "En temporär mapp saknas",
 "Contacts" => "Kontakter",
+"Drop a VCF file to import contacts." => "Släpp en VCF-fil för att importera kontakter.",
+"Addressbook not found." => "Hittade inte adressboken",
 "This is not your addressbook." => "Det här är inte din adressbok.",
 "Contact could not be found." => "Kontakt kunde inte hittas.",
 "Address" => "Adress",
@@ -22,22 +51,53 @@
 "Mobile" => "Mobil",
 "Text" => "Text",
 "Voice" => "Röst",
+"Message" => "Meddelande",
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Personsökare",
+"Internet" => "Internet",
+"{name}'s Birthday" => "{name}'s födelsedag",
 "Contact" => "Kontakt",
 "Add Contact" => "Lägg till kontakt",
 "Addressbooks" => "Adressböcker",
+"Configure Address Books" => "Konfigurera adressböcker",
 "New Address Book" => "Ny adressbok",
+"Import from VCF" => "Importera från VCF",
 "CardDav Link" => "CardDAV länk",
 "Download" => "Nedladdning",
 "Edit" => "Redigera",
 "Delete" => "Radera",
 "Download contact" => "Ladda ner kontakt",
 "Delete contact" => "Radera kontakt",
+"Drop photo to upload" => "Släpp foto för att ladda upp",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => " anpassad, korta namn, hela namn, bakåt eller bakåt med komma",
+"Edit name details" => "Redigera detaljer för namn",
+"Nickname" => "Smeknamn",
+"Enter nickname" => "Ange smeknamn",
 "Birthday" => "Födelsedag",
+"dd-mm-yyyy" => "dd-mm-åååå",
+"Groups" => "Grupper",
+"Separate groups with commas" => "Separera grupperna med kommatecken",
+"Edit groups" => "Editera grupper",
 "Preferred" => "Föredragen",
+"Please specify a valid email address." => "Vänligen ange en giltig e-postadress",
+"Enter email address" => "Ange e-postadress",
+"Mail to address" => "Posta till adress.",
+"Delete email address" => "Ta bort e-postadress",
+"Enter phone number" => "Ange ett telefonnummer",
+"Delete phone number" => "Ta bort telefonnummer",
+"View on map" => "Visa på karta",
+"Edit address details" => "Redigera detaljer för adress",
+"Add notes here." => "Lägg till noteringar här.",
+"Add field" => "Lägg till fält",
+"Profile picture" => "Profilbild",
 "Phone" => "Telefon",
+"Note" => "Notering",
+"Delete current photo" => "Ta bort aktuellt foto",
+"Edit current photo" => "Redigera aktuellt foto",
+"Upload new photo" => "Ladda upp ett nytt foto",
+"Select photo from ownCloud" => "Välj foto från ownCloud",
+"Edit address" => "Editera adress",
 "Type" => "Typ",
 "PO Box" => "Postbox",
 "Extended" => "Utökad",
@@ -46,13 +106,38 @@
 "Region" => "Län",
 "Zipcode" => "Postnummer",
 "Country" => "Land",
+"Edit categories" => "Editera kategorier",
 "Add" => "Ny",
 "Addressbook" => "Adressbok",
+"Miss" => "Herr",
+"Ms" => "Ingen adressbok funnen.",
+"Mr" => "Fru",
+"Mrs" => "Fröken",
+"Dr" => "Dr",
+"Given name" => "Förnamn",
+"Additional names" => "Mellannamn",
+"Family name" => "Efternamn",
+"Ph.D." => "Fil.dr.",
 "New Addressbook" => "Ny adressbok",
 "Edit Addressbook" => "Redigera adressbok",
 "Displayname" => "Visningsnamn",
 "Active" => "Aktiv",
 "Save" => "Spara",
 "Submit" => "Skicka in",
-"Cancel" => "Avbryt"
+"Cancel" => "Avbryt",
+"Import a contacts file" => "Importera en kontaktfil",
+"Please choose the addressbook" => "Vänligen välj adressboken",
+"create a new addressbook" => "skapa en ny adressbok",
+"Name of new addressbook" => "Namn för ny adressbok",
+"Import" => "Importera",
+"Importing contacts" => "Importerar kontakter",
+"Select address book to import to:" => "Importera till adressbok:",
+"Select from HD" => "Välj från hårddisk",
+"You have no contacts in your addressbook." => "Du har inga kontakter i din adressbok.",
+"Add contact" => "Lägg till en kontakt",
+"Configure addressbooks" => "Konfigurera adressböcker",
+"CardDAV syncing addresses" => "CardDAV synkningsadresser",
+"more info" => "mera information",
+"Primary address (Kontact et al)" => "Primär adress (Kontakt o.a.)",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/th_TH.php b/apps/contacts/l10n/th_TH.php
index cb1beb1044..acf382c6a4 100644
--- a/apps/contacts/l10n/th_TH.php
+++ b/apps/contacts/l10n/th_TH.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "เกิดข้อผิดพลาดในการเพิ่มสมุดบันทึกที่อยู่ใหม่",
 "Error activating addressbook." => "เกิดข้อผิดพลาดในการเปิดใช้งานสมุดบันทึกที่อยู่",
 "No contact ID was submitted." => "ไม่มีรหัสข้อมูลการติดต่อถูกส่งมา",
-"Error loading image." => "เกิดข้อผิดพลาดในการโหลดรูปภาพ",
 "Error reading contact photo." => "เกิดข้อผิดพลาดในการอ่านรูปภาพของข้อมูลการติดต่อ",
 "Error saving temporary file." => "เกิดข้อผิดพลาดในการบันทึกไฟล์ชั่วคราว",
 "The loading photo is not valid." => "โหลดรูปภาพไม่ถูกต้อง",
@@ -27,6 +26,7 @@
 "Missing contact id." => "รหัสข้อมูลการติดต่อเกิดการสูญหาย",
 "No photo path was submitted." => "ไม่พบตำแหน่งพาธของรูปภาพ",
 "File doesn't exist:" => "ไม่มีไฟล์ดังกล่าว",
+"Error loading image." => "เกิดข้อผิดพลาดในการโหลดรูปภาพ",
 "element name is not set." => "ยังไม่ได้กำหนดชื่อ",
 "checksum is not set." => "ยังไม่ได้กำหนดค่า checksum",
 "Information about vCard is incorrect. Please reload the page: " => "ข้อมูล vCard ไม่ถูกต้อง กรุณาโหลดหน้าเว็บใหม่อีกครั้ง: ",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "ไม่มีไฟล์ที่ถูกอัพโหลด",
 "Missing a temporary folder" => "โฟลเดอร์ชั่วคราวเกิดการสูญหาย",
 "Contacts" => "ข้อมูลการติดต่อ",
+"Drop a VCF file to import contacts." => "วางไฟล์ VCF ที่ต้องการนำเข้าข้อมูลการติดต่อ",
 "Addressbook not found." => "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ",
 "This is not your addressbook." => "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ",
 "Contact could not be found." => "ไม่พบข้อมูลการติดต่อ",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "กำหนดชื่อของสมุดที่อยู่ที่สร้างใหม่",
 "Import" => "นำเข้า",
 "Importing contacts" => "นำเข้าข้อมูลการติดต่อ",
-"Contacts imported successfully" => "ข้อมูลการติดต่อถูกนำเข้าข้อมูลเรียบร้อยแล้ว",
-"Close Dialog" => "ปิดกล่องข้อความ",
-"Import Addressbook" => "นำเข้าข้อมูลสมุดบันทึกที่อยู่",
 "Select address book to import to:" => "เลือกสมุดบันทึกที่อยู่ที่ต้องการนำเข้า:",
-"Drop a VCF file to import contacts." => "วางไฟล์ VCF ที่ต้องการนำเข้าข้อมูลการติดต่อ",
 "Select from HD" => "เลือกจากฮาร์ดดิส",
 "You have no contacts in your addressbook." => "คุณยังไม่มีข้อมูลการติดต่อใดๆในสมุดบันทึกที่อยู่ของคุณ",
 "Add contact" => "เพิ่มชื่อผู้ติดต่อ",
diff --git a/apps/contacts/l10n/tr.php b/apps/contacts/l10n/tr.php
index 298477c681..65e8e34c30 100644
--- a/apps/contacts/l10n/tr.php
+++ b/apps/contacts/l10n/tr.php
@@ -16,7 +16,6 @@
 "Error adding addressbook." => "Adres defteri eklenirken hata oluştu.",
 "Error activating addressbook." => "Adres defteri etkinleştirilirken hata oluştu.",
 "No contact ID was submitted." => "Bağlantı ID'si girilmedi.",
-"Error loading image." => "İmaj yükleme hatası.",
 "Error reading contact photo." => "Bağlantı fotoğrafı okunamadı.",
 "Error saving temporary file." => "Geçici dosya kaydetme hatası.",
 "The loading photo is not valid." => "Yüklenecek fotograf geçerli değil.",
@@ -27,6 +26,7 @@
 "Missing contact id." => "Eksik bağlantı id'si.",
 "No photo path was submitted." => "Fotoğraf girilmedi.",
 "File doesn't exist:" => "Dosya mevcut değil:",
+"Error loading image." => "İmaj yükleme hatası.",
 "element name is not set." => "eleman ismi atanmamış.",
 "checksum is not set." => "checksum atanmamış.",
 "Information about vCard is incorrect. Please reload the page: " => "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: ",
@@ -42,6 +42,7 @@
 "No file was uploaded" => "Hiç dosya gönderilmedi",
 "Missing a temporary folder" => "Geçici dizin eksik",
 "Contacts" => "Kişiler",
+"Drop a VCF file to import contacts." => "Bağlantıları içe aktarmak için bir VCF dosyası bırakın.",
 "Addressbook not found." => "Adres defteri bulunamadı.",
 "This is not your addressbook." => "Bu sizin adres defteriniz değil.",
 "Contact could not be found." => "Kişi bulunamadı.",
@@ -144,11 +145,7 @@
 "Name of new addressbook" => "Yeni adres defteri için isim",
 "Import" => "İçe aktar",
 "Importing contacts" => "Bağlantıları içe aktar",
-"Contacts imported successfully" => "Bağlantılar başarıyla içe aktarıldı",
-"Close Dialog" => "Diyaloğu kapat",
-"Import Addressbook" => "Adres defterini içeri aktar",
 "Select address book to import to:" => "İçe aktarılacak adres defterini seçin:",
-"Drop a VCF file to import contacts." => "Bağlantıları içe aktarmak için bir VCF dosyası bırakın.",
 "Select from HD" => "HD'den seç",
 "You have no contacts in your addressbook." => "Adres defterinizde hiç bağlantı yok.",
 "Add contact" => "Bağlatı ekle",
diff --git a/apps/contacts/l10n/zh_CN.php b/apps/contacts/l10n/zh_CN.php
index d2cbf5570e..dcf9b99bc8 100644
--- a/apps/contacts/l10n/zh_CN.php
+++ b/apps/contacts/l10n/zh_CN.php
@@ -3,27 +3,36 @@
 "There was an error adding the contact." => "添加联系人时出错。",
 "Cannot add empty property." => "无法添加空属性。",
 "At least one of the address fields has to be filled out." => "至少需要填写一项地址。",
+"Trying to add duplicate property: " => "试图添加重复属性： ",
 "Error adding contact property." => "添加联系人属性错误。",
+"No ID provided" => "未提供 ID",
 "Error setting checksum." => "设置校验值错误。",
+"No categories selected for deletion." => "未选中要删除的分类。",
 "No address books found." => "找不到地址簿。",
 "No contacts found." => "找不到联系人。",
 "Missing ID" => "缺少 ID",
+"Error parsing VCard for ID: \"" => "无法解析如下ID的 VCard：“",
+"Cannot add addressbook with an empty name." => "无法无姓名的地址簿。",
 "Error adding addressbook." => "添加地址簿错误。",
 "Error activating addressbook." => "激活地址簿错误。",
-"Error loading image." => "加载图片错误。",
+"No contact ID was submitted." => "未提交联系人 ID。",
 "Error reading contact photo." => "读取联系人照片错误。",
 "Error saving temporary file." => "保存临时文件错误。",
+"The loading photo is not valid." => "装入的照片不正确。",
 "id is not set." => "没有设置 id。",
 "Information about vCard is incorrect. Please reload the page." => "vCard 的信息不正确。请重新加载页面。",
 "Error deleting contact property." => "删除联系人属性错误。",
 "Contact ID is missing." => "缺少联系人 ID。",
 "Missing contact id." => "缺少联系人 ID。",
+"No photo path was submitted." => "未提供照片路径。",
 "File doesn't exist:" => "文件不存在:",
+"Error loading image." => "加载图片错误。",
 "checksum is not set." => "未设置校验值。",
 "Error updating contact property." => "更新联系人属性错误。",
 "Error updating addressbook." => "更新地址簿错误",
 "The uploaded file was only partially uploaded" => "已上传文件只上传了部分",
 "No file was uploaded" => "没有文件被上传",
+"Missing a temporary folder" => "缺少临时目录",
 "Contacts" => "联系人",
 "Addressbook not found." => "未找到地址簿。",
 "This is not your addressbook." => "这不是您的地址簿。",
@@ -37,6 +46,7 @@
 "Mobile" => "移动电话",
 "Text" => "文本",
 "Voice" => "语音",
+"Message" => "消息",
 "Fax" => "传真",
 "Video" => "视频",
 "Pager" => "传呼机",
@@ -54,6 +64,8 @@
 "Delete" => "删除",
 "Download contact" => "下载联系人",
 "Delete contact" => "删除联系人",
+"Drop photo to upload" => "拖拽图片进行上传",
+"Edit name details" => "编辑名称详情",
 "Nickname" => "昵称",
 "Enter nickname" => "输入昵称",
 "Birthday" => "生日",
@@ -70,7 +82,11 @@
 "Delete phone number" => "删除电话号码",
 "View on map" => "在地图上显示",
 "Edit address details" => "编辑地址细节。",
+"Add notes here." => "添加注释。",
+"Add field" => "添加字段",
+"Profile picture" => "联系人图片",
 "Phone" => "电话",
+"Note" => "注释",
 "Delete current photo" => "删除当前照片",
 "Edit current photo" => "编辑当前照片",
 "Upload new photo" => "上传新照片",
@@ -102,8 +118,9 @@
 "Name of new addressbook" => "新地址簿名称",
 "Import" => "导入",
 "Importing contacts" => "导入联系人",
-"Contacts imported successfully" => "联系人导入成功",
-"Close Dialog" => "关闭对话框",
+"Add contact" => "添加联系人",
+"Configure addressbooks" => "配置地址簿",
+"CardDAV syncing addresses" => "CardDAV 同步地址",
 "more info" => "更多信息",
 "Primary address (Kontact et al)" => "首选地址 (Kontact 等)",
 "iOS/OS X" => "iOS/OS X"
diff --git a/apps/contacts/l10n/zh_TW.php b/apps/contacts/l10n/zh_TW.php
index da2d0b46f5..d4c2efc47a 100644
--- a/apps/contacts/l10n/zh_TW.php
+++ b/apps/contacts/l10n/zh_TW.php
@@ -5,13 +5,17 @@
 "At least one of the address fields has to be filled out." => "至少必須填寫一欄地址",
 "Error adding contact property." => "添加通訊錄內容中發生錯誤",
 "No ID provided" => "未提供 ID",
+"No contacts found." => "沒有找到聯絡人",
+"Missing ID" => "遺失ID",
 "Error adding addressbook." => "添加電話簿中發生錯誤",
 "Error activating addressbook." => "啟用電話簿中發生錯誤",
 "Information about vCard is incorrect. Please reload the page." => "有關 vCard 的資訊不正確，請重新載入此頁。",
 "Error deleting contact property." => "刪除通訊錄內容中發生錯誤",
 "Error updating contact property." => "更新通訊錄內容中發生錯誤",
 "Error updating addressbook." => "電話簿更新中發生錯誤",
+"No file was uploaded" => "沒有已上傳的檔案",
 "Contacts" => "通訊錄",
+"Addressbook not found." => "找不到通訊錄",
 "This is not your addressbook." => "這不是你的電話簿",
 "Contact could not be found." => "通訊錄未發現",
 "Address" => "地址",
@@ -28,24 +32,40 @@
 "Video" => "影片",
 "Pager" => "呼叫器",
 "Internet" => "網際網路",
+"{name}'s Birthday" => "{name}的生日",
 "Contact" => "通訊錄",
 "Add Contact" => "添加通訊錄",
 "Addressbooks" => "電話簿",
+"Configure Address Books" => "設定通訊錄",
 "New Address Book" => "新電話簿",
+"Import from VCF" => "從VCF匯入",
 "CardDav Link" => "CardDav 聯結",
 "Download" => "下載",
 "Edit" => "編輯",
 "Delete" => "刪除",
 "Download contact" => "下載通訊錄",
 "Delete contact" => "刪除通訊錄",
+"Edit name details" => "編輯姓名詳細資訊",
 "Nickname" => "綽號",
 "Enter nickname" => "輸入綽號",
 "Birthday" => "生日",
+"dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "群組",
+"Separate groups with commas" => "用逗號分隔群組",
 "Edit groups" => "編輯群組",
 "Preferred" => "首選",
+"Please specify a valid email address." => "註填入合法的電子郵件住址",
 "Enter email address" => "輸入電子郵件地址",
+"Mail to address" => "寄送住址",
+"Delete email address" => "刪除電子郵件住址",
+"Enter phone number" => "輸入電話號碼",
+"Delete phone number" => "刪除電話號碼",
+"Edit address details" => "電子郵件住址詳細資訊",
+"Add notes here." => "在這裡新增註解",
+"Add field" => "新增欄位",
+"Profile picture" => "個人資料照片",
 "Phone" => "電話",
+"Note" => "註解",
 "Type" => "類型",
 "PO Box" => "通訊地址",
 "Extended" => "分機",
@@ -56,6 +76,13 @@
 "Country" => "國家",
 "Add" => "添加",
 "Addressbook" => "電話簿",
+"Mr" => "先生",
+"Sir" => "先生",
+"Mrs" => "小姐",
+"Dr" => "博士（醫生）",
+"Given name" => "給定名（名）",
+"Additional names" => "額外名",
+"Family name" => "家族名（姓）",
 "New Addressbook" => "新電話簿",
 "Edit Addressbook" => "編輯電話簿",
 "Displayname" => "顯示名稱",
diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
index 729c2dfbcf..4660d61f61 100644
--- a/apps/contacts/photo.php
+++ b/apps/contacts/photo.php
@@ -14,7 +14,7 @@ OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('contacts');
 
 function getStandardImage(){
-	OCP\Response::setExpiresHeader('P10D');
+	//OCP\Response::setExpiresHeader('P10D');
 	OCP\Response::enableCaching();
 	OCP\Response::redirect(OCP\Util::imagePath('contacts', 'person_large.png'));
 }
diff --git a/apps/contacts/templates/part.cropphoto.php b/apps/contacts/templates/part.cropphoto.php
index 599951d9a9..d7f0efc57d 100644
--- a/apps/contacts/templates/part.cropphoto.php
+++ b/apps/contacts/templates/part.cropphoto.php
@@ -1,7 +1,7 @@
 <?php 
 $id = $_['id'];
-$tmp_path = $_['tmp_path'];
-OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OCP\Util::DEBUG);
+$tmpkey = $_['tmpkey'];
+OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmpkey: '.$tmpkey, OCP\Util::DEBUG);
 ?>
 <script language="Javascript">
 	jQuery(function($) {
@@ -38,7 +38,8 @@ OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmp_path: '.$tmp_pa
 		return true;
 	});*/
 </script>
-<img id="cropbox" src="<?php echo OCP\Util::linkToAbsolute('contacts', 'dynphoto.php'); ?>?tmp_path=<?php echo urlencode($tmp_path); ?>" />
+<?php if(OC_Cache::hasKey($tmpkey)) { ?>
+<img id="cropbox" src="<?php echo OCP\Util::linkToAbsolute('contacts', 'tmpphoto.php'); ?>?tmpkey=<?php echo $tmpkey; ?>" />
 <form id="cropform"
 	class="coords"
 	method="post"
@@ -47,7 +48,7 @@ OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmp_path: '.$tmp_pa
 	action="<?php echo OCP\Util::linkToAbsolute('contacts', 'ajax/savecrop.php'); ?>">
 
 	<input type="hidden" id="id" name="id" value="<?php echo $id; ?>" />
-	<input type="hidden" id="tmp_path" name="tmp_path" value="<?php echo $tmp_path; ?>" />
+	<input type="hidden" id="tmpkey" name="tmpkey" value="<?php echo $tmpkey; ?>" />
 	<fieldset id="coords">
 	<input type="hidden" id="x1" name="x1" value="" />
 	<input type="hidden" id="y1" name="y1" value="" />
@@ -58,5 +59,8 @@ OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmp_path: '.$tmp_pa
 	</fieldset>
 	<iframe name="crop_target" id='crop_target' src=""></iframe>
 </form>
-
-
+<?php
+} else { 
+	echo $l->t('The temporary image has been removed from cache.');
+}
+?>
diff --git a/apps/contacts/templates/part.import.php b/apps/contacts/templates/part.import.php
index b879304299..32c8dc50dd 100644
--- a/apps/contacts/templates/part.import.php
+++ b/apps/contacts/templates/part.import.php
@@ -2,7 +2,7 @@
 	<div id="form_container">
 		<input type="hidden" id="filename" value="<?php echo $_['filename'];?>">
 		<input type="hidden" id="path" value="<?php echo $_['path'];?>">
-		<input type="hidden" id="progressfile" value="<?php echo md5(session_id()) . '.txt';?>">
+		<input type="hidden" id="progresskey" value="<?php echo rand() ?>">
 		<p class="bold" style="text-align:center;"><?php echo $l->t('Please choose the addressbook'); ?></p>
 		<select style="width:100%;" id="contacts" name="contacts">
 		<?php
diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index 5b340042a2..da4e930f3e 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -20,14 +20,12 @@
  *
  */
 
-// Init owncloud
-
 OCP\JSON::checkLoggedIn();
 //OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('contacts');
 
 function getStandardImage(){
-	OCP\Response::setExpiresHeader('P10D');
+	//OCP\Response::setExpiresHeader('P10D');
 	OCP\Response::enableCaching();
 	OCP\Response::redirect(OCP\Util::imagePath('contacts', 'person.png'));
 }
@@ -59,12 +57,10 @@ $image = new OC_Image();
 $photo = $contact->getAsString('PHOTO');
 if($photo) {
 	OCP\Response::setETagHeader(md5($photo));
-
 	if($image->loadFromBase64($photo)) {
 		if($image->centerCrop()) {
 			if($image->resize($thumbnail_size)) {
 				if($image->show()) {
-					// done
 					exit();
 				} else {
 					OCP\Util::writeLog('contacts','thumbnail.php. Couldn\'t display thumbnail for ID '.$id,OCP\Util::ERROR);
diff --git a/apps/contacts/dynphoto.php b/apps/contacts/tmpphoto.php
similarity index 82%
rename from apps/contacts/dynphoto.php
rename to apps/contacts/tmpphoto.php
index ea6cef227e..5fde8de997 100644
--- a/apps/contacts/dynphoto.php
+++ b/apps/contacts/tmpphoto.php
@@ -20,15 +20,14 @@
  *
  */
 
-// Init owncloud
-
-$tmp_path = $_GET['tmp_path'];
+$tmpkey = $_GET['tmpkey'];
 $maxsize = isset($_GET['maxsize']) ? $_GET['maxsize'] : -1;
 header("Cache-Control: no-cache, no-store, must-revalidate");
 
-OCP\Util::writeLog('contacts','dynphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OCP\Util::DEBUG);
+OCP\Util::writeLog('contacts','tmpphoto.php: tmpkey: '.$tmpkey, OCP\Util::DEBUG);
 
-$image = new OC_Image($tmp_path);
+$image = new OC_Image();
+$image->loadFromData(OC_Cache::get($tmpkey));
 if($maxsize != -1) {
 	$image->resize($maxsize);
 }
diff --git a/apps/files/admin.php b/apps/files/admin.php
index b0c2b35c69..d05eb7267b 100644
--- a/apps/files/admin.php
+++ b/apps/files/admin.php
@@ -51,8 +51,10 @@ $allowZipDownload = intval(OCP\Config::getSystemValue('allowZipDownload', true))
 
 OCP\App::setActiveNavigationEntry( "files_administration" );
 
+$htaccessWritable=is_writable(OC::$SERVERROOT.'/.htaccess');
+
 $tmpl = new OCP\Template( 'files', 'admin' );
-$tmpl->assign( 'htaccessWorking', $htaccessWorking );
+$tmpl->assign( 'uploadChangable', $htaccessWorking and $htaccessWritable );
 $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->assign( 'maxPossibleUploadSize', OCP\Util::humanFileSize(PHP_INT_MAX));
 $tmpl->assign( 'allowZipDownload', $allowZipDownload);
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 316eac0562..edb7841487 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -15,6 +15,10 @@ if($filename == '') {
 	OCP\JSON::error(array("data" => array( "message" => "Empty Filename" )));
 	exit();
 }
+if(strpos($filename,'/')!==false){
+	OCP\JSON::error(array("data" => array( "message" => "Invalid Filename" )));
+	exit();
+}
 
 if($source){
 	if(substr($source,0,8)!='https://' and substr($source,0,7)!='http://'){
diff --git a/apps/files/ajax/newfolder.php b/apps/files/ajax/newfolder.php
index 512e0e1f6d..0668a6191f 100644
--- a/apps/files/ajax/newfolder.php
+++ b/apps/files/ajax/newfolder.php
@@ -13,6 +13,10 @@ if(trim($foldername) == '') {
 	OCP\JSON::error(array("data" => array( "message" => "Empty Foldername" )));
 	exit();
 }
+if(strpos($filename,'/')!==false){
+	OCP\JSON::error(array("data" => array( "message" => "Invalid Foldername" )));
+	exit();
+}
 
 if(OC_Files::newFile($dir, stripslashes($foldername), 'dir')) {
 	OCP\JSON::success(array("data" => array()));
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 19978b61a7..0c672cd670 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -51,7 +51,7 @@ FileActions={
 		var actions=this.get(mime,type);
 		return actions[name];
 	},
-	display:function(parent){
+	display:function(parent, filename, type){
 		FileActions.currentFile=parent;
 		$('#fileList span.fileactions, #fileList td.date a.action').remove();
 		var actions=FileActions.get(FileActions.getCurrentMimeType(),FileActions.getCurrentType());
@@ -62,6 +62,8 @@ FileActions={
 		parent.children('a.name').append('<span class="fileactions" />');
 		var defaultAction=FileActions.getDefault(FileActions.getCurrentMimeType(),FileActions.getCurrentType());
 		for(name in actions){
+			// no rename and share action for the 'Shared' dir
+			if((name=='Rename' || name =='Share') && type=='dir' && filename=='Shared') { continue; }
 			if((name=='Download' || actions[name]!=defaultAction) && name!='Delete'){
 				var img=FileActions.icons[name];
 				if(img.call){
@@ -84,7 +86,7 @@ FileActions={
 				parent.find('a.name>span.fileactions').append(element);
 			}
 		}
-		if(actions['Delete']){
+		if(actions['Delete'] && (type!='dir' || filename != 'Shared')){ // no delete action for the 'Shared' dir
 			var img=FileActions.icons['Delete'];
 			if(img.call){
 				img=img(file);
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 7d9c53eaa8..a079deb953 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -56,7 +56,7 @@ $(document).ready(function() {
 
 	// Sets the file-action buttons behaviour :
 	$('tr').live('mouseenter',function(event) {
-		FileActions.display($(this).children('td.filename'));
+		FileActions.display($(this).children('td.filename'), $(this).attr('data-file'), $(this).attr('data-type'));
 	});
 	$('tr').live('mouseleave',function(event) {
 		FileActions.hide();
@@ -452,6 +452,11 @@ $(document).ready(function() {
 		input.focus();
 		input.change(function(){
 			var name=$(this).val();
+			if(name.indexOf('/')!=-1){
+				$('#notification').text(t('files','Invalid name, \'/\' is not allowed.'));
+				$('#notification').fadeIn();
+				return;
+			}
 			switch(type){
 				case 'file':
 					$.post(
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index 45de516f9d..91e748e300 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -6,6 +6,8 @@
 "No file was uploaded" => "لم يتم ترفيع أي من الملفات",
 "Missing a temporary folder" => "المجلد المؤقت غير موجود",
 "Files" => "الملفات",
+"Size" => "حجم",
+"Modified" => "معدل",
 "Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها",
 "New" => "جديد",
 "Text file" => "ملف",
@@ -14,8 +16,6 @@
 "Nothing in here. Upload something!" => "لا يوجد شيء هنا. إرفع بعض الملفات!",
 "Name" => "الاسم",
 "Download" => "تحميل",
-"Size" => "حجم",
-"Modified" => "معدل",
 "Delete" => "محذوف",
 "Upload too large" => "حجم الترفيع أعلى من المسموح",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم."
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index 027a769820..83b3608731 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -6,13 +6,13 @@
 "No file was uploaded" => "Фахлът не бе качен",
 "Missing a temporary folder" => "Липсва временната папка",
 "Files" => "Файлове",
+"Size" => "Размер",
+"Modified" => "Променено",
 "Maximum upload size" => "Макс. размер за качване",
 "Upload" => "Качване",
 "Nothing in here. Upload something!" => "Няма нищо, качете нещо!",
 "Name" => "Име",
 "Download" => "Изтегляне",
-"Size" => "Размер",
-"Modified" => "Променено",
 "Delete" => "Изтриване",
 "Upload too large" => "Файлът е прекалено голям",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете които се опитвате да качите са по-големи от позволеното за сървъра."
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 9cbc606021..baa6b3b7d4 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "S'ha perdut un fitxer temporal",
 "Failed to write to disk" => "Ha fallat en escriure al disc",
 "Files" => "Fitxers",
+"Size" => "Mida",
+"Modified" => "Modificat",
 "File handling" => "Gestió de fitxers",
 "Maximum upload size" => "Mida màxima de pujada",
 "max. possible: " => "màxim possible:",
@@ -24,9 +26,6 @@
 "Name" => "Nom",
 "Share" => "Comparteix",
 "Download" => "Baixa",
-"Size" => "Mida",
-"Modified" => "Modificat",
-"Delete all" => "Esborra-ho tot",
 "Delete" => "Suprimeix",
 "Upload too large" => "La pujada és massa gran",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 033fbfca11..9a4be26dad 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Chybí adresář pro sočasné soubory",
 "Failed to write to disk" => "Zápis na disk se nezdařil",
 "Files" => "Soubory",
+"Size" => "Velikost",
+"Modified" => "Změněno",
 "File handling" => "Nastavení chování k souborům",
 "Maximum upload size" => "Maximální velikost ukládaných souborů",
 "max. possible: " => "největší možná:",
@@ -24,9 +26,6 @@
 "Name" => "Název",
 "Share" => "Sdílet",
 "Download" => "Stáhnout",
-"Size" => "Velikost",
-"Modified" => "Změněno",
-"Delete all" => "Smazat vše",
 "Delete" => "Vymazat",
 "Upload too large" => "Příliš velký soubor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte uložit, překračují maximální velikosti uploadu na tomto serveru.",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 5d199ce806..3683ab8484 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -5,18 +5,30 @@
 "The uploaded file was only partially uploaded" => "Den uploadede file blev kun delvist uploadet",
 "No file was uploaded" => "Ingen fil blev uploadet",
 "Missing a temporary folder" => "Mangler en midlertidig mappe",
+"Failed to write to disk" => "Fejl ved skrivning til disk.",
 "Files" => "Filer",
+"Size" => "Størrelse",
+"Modified" => "Ændret",
+"File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimal upload-størrelse",
+"max. possible: " => "max. mulige: ",
+"Needed for multi-file and folder downloads." => "Nødvendigt for at kunne downloade mapper og flere filer ad gangen.",
+"Enable ZIP-download" => "Muliggør ZIP-download",
+"0 is unlimited" => "0 er ubegrænset",
+"Maximum input size for ZIP files" => "Maksimal størrelse på ZIP filer",
 "New" => "Ny",
 "Text file" => "Tekstfil",
 "Folder" => "Mappe",
+"From url" => "Fra URL",
 "Upload" => "Upload",
+"Cancel upload" => "Fortryd upload",
 "Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
 "Name" => "Navn",
+"Share" => "Del",
 "Download" => "Download",
-"Size" => "Størrelse",
-"Modified" => "Ændret",
 "Delete" => "Slet",
 "Upload too large" => "Upload for stor",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
+"Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst.",
+"Current scanning" => "Indlæser"
 );
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 078cb8e902..9c5310c43b 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -1,20 +1,23 @@
 <?php $TRANSLATIONS = array(
-"There is no error, the file uploaded with success" => "Datei hochgeladen.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Die hochgeladene Datei ist zu groß.",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die hochgeladene Datei ist zu groß.",
+"There is no error, the file uploaded with success" => "Datei fehlerfrei hochgeladen.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Die Größe der hochzuladenden Datei überschreitet die upload_max_filesize-Richtlinie in php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde",
 "The uploaded file was only partially uploaded" => "Die Datei wurde nur teilweise hochgeladen.",
 "No file was uploaded" => "Es wurde keine Datei hochgeladen.",
 "Missing a temporary folder" => "Temporärer Ordner fehlt.",
 "Failed to write to disk" => "Fehler beim Schreiben auf Festplatte",
-"Files" => "Dateien",
-"Maximum upload size" => "Maximale Größe",
+"Files" => "Files",
+"Size" => "Größe",
+"Modified" => "Bearbeitet",
+"File handling" => "Dateibehandlung",
+"Maximum upload size" => "Maximum upload size",
 "max. possible: " => "maximal möglich:",
-"Needed for multi-file and folder downloads." => "Für Mehrfachdateien- und Ordnerupload benötigt:",
+"Needed for multi-file and folder downloads." => "Für Mehrfachdateien- und Ordnerdownloads benötigt:",
 "Enable ZIP-download" => "ZIP-Download aktivieren",
 "0 is unlimited" => "0 bedeutet unbegrenzt",
 "Maximum input size for ZIP files" => "Maximale Größe für ZIP Dateien",
 "New" => "Neu",
-"Text file" => "Text Datei",
+"Text file" => "Textdatei",
 "Folder" => "Ordner",
 "From url" => "Von der URL",
 "Upload" => "Hochladen",
@@ -23,9 +26,6 @@
 "Name" => "Name",
 "Share" => "Teilen",
 "Download" => "Herunterladen",
-"Size" => "Größe",
-"Modified" => "Bearbeitet",
-"Delete all" => "Alle löschen",
 "Delete" => "Löschen",
 "Upload too large" => "Upload zu groß",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index de16f97eed..93be024615 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Λείπει ένας προσωρινός φάκελος",
 "Failed to write to disk" => "Η εγγραφή στο δίσκο απέτυχε",
 "Files" => "Αρχεία",
+"Size" => "Μέγεθος",
+"Modified" => "Τροποποιήθηκε",
 "File handling" => "Διαχείριση αρχείων",
 "Maximum upload size" => "Μέγιστο μέγεθος μεταφόρτωσης",
 "max. possible: " => "μέγιστο δυνατό:",
@@ -24,9 +26,6 @@
 "Name" => "Όνομα",
 "Share" => "Διαμοίρασε",
 "Download" => "Λήψη",
-"Size" => "Μέγεθος",
-"Modified" => "Τροποποιήθηκε",
-"Delete all" => "Διαγραφή όλων",
 "Delete" => "Διαγραφή",
 "Upload too large" => "Πολύ μεγάλο το αρχείο προς μεταφόρτωση",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος μεταφόρτωσης αρχείων σε αυτόν το διακομιστή.",
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index b38bd9df0f..64c380d600 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Mankas tempa dosierujo",
 "Failed to write to disk" => "Malsukcesis skribo al disko",
 "Files" => "Dosieroj",
+"Size" => "Grando",
+"Modified" => "Modifita",
 "File handling" => "Dosieradministro",
 "Maximum upload size" => "Maksimuma alŝutogrando",
 "max. possible: " => "maks. ebla: ",
@@ -24,9 +26,6 @@
 "Name" => "Nomo",
 "Share" => "Kunhavigi",
 "Download" => "Elŝuti",
-"Size" => "Grando",
-"Modified" => "Modifita",
-"Delete all" => "Forigi ĉion",
 "Delete" => "Forigi",
 "Upload too large" => "Elŝuto tro larĝa",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index e51a9f325b..67bfb4702e 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Falta un directorio temporal",
 "Failed to write to disk" => "La escritura en disco ha fallado",
 "Files" => "Archivos",
+"Size" => "Tamaño",
+"Modified" => "Modificado",
 "File handling" => "Tratamiento de archivos",
 "Maximum upload size" => "Tamaño máximo de subida",
 "max. possible: " => "máx. posible:",
@@ -24,9 +26,6 @@
 "Name" => "Nombre",
 "Share" => "Compartir",
 "Download" => "Descargar",
-"Size" => "Tamaño",
-"Modified" => "Modificado",
-"Delete all" => "Eliminar todo",
 "Delete" => "Eliminado",
 "Upload too large" => "El archivo es demasiado grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido por este servidor.",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index cdac89e66e..89bb96581c 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Ajutiste failide kaust puudub",
 "Failed to write to disk" => "Kettale kirjutamine ebaõnnestus",
 "Files" => "Failid",
+"Size" => "Suurus",
+"Modified" => "Muudetud",
 "File handling" => "Failide käsitlemine",
 "Maximum upload size" => "Maksimaalne üleslaadimise suurus",
 "max. possible: " => "maks. võimalik: ",
@@ -24,9 +26,6 @@
 "Name" => "Nimi",
 "Share" => "Jaga",
 "Download" => "Lae alla",
-"Size" => "Suurus",
-"Modified" => "Muudetud",
-"Delete all" => "Kustuta kõik",
 "Delete" => "Kustuta",
 "Upload too large" => "Üleslaadimine on liiga suur",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 1f780b9d90..a7ca21f496 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Aldi baterako karpeta falta da",
 "Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
 "Files" => "Fitxategiak",
+"Size" => "Tamaina",
+"Modified" => "Aldatuta",
 "File handling" => "Fitxategien kudeaketa",
 "Maximum upload size" => "Igo daitekeen gehienezko tamaina",
 "max. possible: " => "max, posiblea:",
@@ -24,9 +26,6 @@
 "Name" => "Izena",
 "Share" => "Elkarbanatu",
 "Download" => "Deskargatu",
-"Size" => "Tamaina",
-"Modified" => "Aldatuta",
-"Delete all" => "Ezabatu dena",
 "Delete" => "Ezabatu",
 "Upload too large" => "Igotakoa handiegia da",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 5c5c32c0eb..4bb46e1fcf 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "یک پوشه موقت گم شده است",
 "Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود",
 "Files" => "فایل ها",
+"Size" => "اندازه",
+"Modified" => "تغییر یافته",
 "File handling" => "اداره پرونده ها",
 "Maximum upload size" => "حداکثر اندازه بارگزاری",
 "max. possible: " => "حداکثرمقدارممکن:",
@@ -24,9 +26,6 @@
 "Name" => "نام",
 "Share" => "به اشتراک گذاری",
 "Download" => "بارگیری",
-"Size" => "اندازه",
-"Modified" => "تغییر یافته",
-"Delete all" => "پاک کردن همه",
 "Delete" => "پاک کردن",
 "Upload too large" => "حجم بارگذاری بسیار زیاد است",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
new file mode 100644
index 0000000000..c99d4408f6
--- /dev/null
+++ b/apps/files/l10n/fi_FI.php
@@ -0,0 +1,32 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Ei virheitä, tiedosto lähetettiin onnistuneesti",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Lähetetty tiedosto ylittää upload_max_filesize-arvon rajan php.ini-tiedostossa",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Lähetetty tiedosto ylittää HTML-lomakkeessa määritetyn MAX_FILE_SIZE-arvon ylärajan",
+"The uploaded file was only partially uploaded" => "Tiedoston lähetys onnistui vain osittain",
+"No file was uploaded" => "Yhtäkään tiedostoa ei lähetetty",
+"Missing a temporary folder" => "Väliaikaiskansiota ei ole olemassa",
+"Failed to write to disk" => "Levylle kirjoitus epäonnistui",
+"Files" => "Tiedostot",
+"Size" => "Koko",
+"Modified" => "Muutettu",
+"File handling" => "Tiedostonhallinta",
+"Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko",
+"Needed for multi-file and folder downloads." => "Tarvitaan useampien tiedostojen ja kansioiden latausta varten.",
+"Enable ZIP-download" => "Ota ZIP-paketin lataaminen käytöön",
+"0 is unlimited" => "0 on rajoittamaton",
+"Maximum input size for ZIP files" => "ZIP-tiedostojen enimmäiskoko",
+"New" => "Uusi",
+"Text file" => "Tekstitiedosto",
+"Folder" => "Kansio",
+"From url" => "Verkko-osoitteesta",
+"Upload" => "Lähetä",
+"Cancel upload" => "Peru lähetys",
+"Nothing in here. Upload something!" => "Täällä ei ole mitään. Lähetä tänne jotakin!",
+"Name" => "Nimi",
+"Share" => "Jaa",
+"Download" => "Lataa",
+"Delete" => "Poista",
+"Upload too large" => "Lähetettävä tiedosto on liian suuri",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",
+"Files are being scanned, please wait." => "Tiedostoja tarkistetaan, odota hetki."
+);
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 6b16e8ac13..ab2f4ea13d 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Il manque un répertoire temporaire",
 "Failed to write to disk" => "Erreur d'écriture sur le disque",
 "Files" => "Fichiers",
+"Size" => "Taille",
+"Modified" => "Modifié",
 "File handling" => "Gestion des fichiers",
 "Maximum upload size" => "Taille max. d'envoi",
 "max. possible: " => "Max. possible :",
@@ -24,9 +26,6 @@
 "Name" => "Nom",
 "Share" => "Partager",
 "Download" => "Téléchargement",
-"Size" => "Taille",
-"Modified" => "Modifié",
-"Delete all" => "Supprimer tout",
 "Delete" => "Supprimer",
 "Upload too large" => "Fichier trop volumineux",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index e0e90f114b..36eafaefe2 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -5,18 +5,30 @@
 "The uploaded file was only partially uploaded" => "O ficheiro enviado foi só parcialmente enviado",
 "No file was uploaded" => "Non se enviou ningún ficheiro",
 "Missing a temporary folder" => "Falta un cartafol temporal",
+"Failed to write to disk" => "Erro ao escribir no disco",
 "Files" => "Ficheiros",
+"Size" => "Tamaño",
+"Modified" => "Modificado",
+"File handling" => "Manexo de ficheiro",
 "Maximum upload size" => "Tamaño máximo de envío",
+"max. possible: " => "máx. posible: ",
+"Needed for multi-file and folder downloads." => "Preciso para descarga de varios ficheiros e cartafoles.",
+"Enable ZIP-download" => "Habilitar a descarga-ZIP",
+"0 is unlimited" => "0 significa ilimitado",
+"Maximum input size for ZIP files" => "Tamaño máximo de descarga para os ZIP",
 "New" => "Novo",
 "Text file" => "Ficheiro de texto",
 "Folder" => "Cartafol",
+"From url" => "Desde url",
 "Upload" => "Enviar",
+"Cancel upload" => "Cancelar subida",
 "Nothing in here. Upload something!" => "Nada por aquí. Envíe algo.",
 "Name" => "Nome",
+"Share" => "Compartir",
 "Download" => "Descargar",
-"Size" => "Tamaño",
-"Modified" => "Modificado",
 "Delete" => "Eliminar",
 "Upload too large" => "Envío demasiado grande",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que trata de subir superan o tamaño máximo permitido neste servidor"
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que trata de subir superan o tamaño máximo permitido neste servidor",
+"Files are being scanned, please wait." => "Estanse analizando os ficheiros, espere por favor.",
+"Current scanning" => "Análise actual."
 );
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index 79ae1edb7a..0876eb952c 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -5,15 +5,30 @@
 "The uploaded file was only partially uploaded" => "הקובץ שהועלה הועלה בצורה חלקית",
 "No file was uploaded" => "לא הועלו קבצים",
 "Missing a temporary folder" => "תיקייה זמנית חסרה",
+"Failed to write to disk" => "הכתיבה לכונן נכשלה",
 "Files" => "קבצים",
-"Maximum upload size" => "גודל העלאה מקסימלי",
-"Upload" => "העלאה",
-"Nothing in here. Upload something!" => "אין כאן שום דבר. אולי ברצונך להעלות משהו?",
-"Name" => "שם",
-"Download" => "הורדה",
 "Size" => "גודל",
 "Modified" => "זמן שינוי",
+"File handling" => "טיפול בקבצים",
+"Maximum upload size" => "גודל העלאה מקסימלי",
+"max. possible: " => "המרבי האפשרי: ",
+"Needed for multi-file and folder downloads." => "נחוץ להורדה של ריבוי קבצים או תיקיות.",
+"Enable ZIP-download" => "הפעלת הורדת ZIP",
+"0 is unlimited" => "0 - ללא הגבלה",
+"Maximum input size for ZIP files" => "גודל הקלט המרבי לקובצי ZIP",
+"New" => "חדש",
+"Text file" => "קובץ טקסט",
+"Folder" => "תיקייה",
+"From url" => "מכתובת",
+"Upload" => "העלאה",
+"Cancel upload" => "ביטול ההעלאה",
+"Nothing in here. Upload something!" => "אין כאן שום דבר. אולי ברצונך להעלות משהו?",
+"Name" => "שם",
+"Share" => "שיתוף",
+"Download" => "הורדה",
 "Delete" => "מחיקה",
 "Upload too large" => "העלאה גדולה מידי",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.",
+"Files are being scanned, please wait." => "הקבצים נסרקים, נא להמתין.",
+"Current scanning" => "הסריקה הנוכחית"
 );
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index 670e87f655..3281d20a61 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -5,15 +5,30 @@
 "The uploaded file was only partially uploaded" => "Datoteka je poslana samo djelomično",
 "No file was uploaded" => "Ni jedna datoteka nije poslana",
 "Missing a temporary folder" => "Nedostaje privremena mapa",
+"Failed to write to disk" => "Neuspjelo pisanje na disk",
 "Files" => "Datoteke",
-"Maximum upload size" => "Maksimalna veličina prijenosa",
-"Upload" => "Pošalji",
-"Nothing in here. Upload something!" => "Nema ničega u ovoj mapi. Pošalji nešto!",
-"Name" => "Naziv",
-"Download" => "Preuzmi",
 "Size" => "Veličina",
 "Modified" => "Zadnja promjena",
+"File handling" => "datoteka za rukovanje",
+"Maximum upload size" => "Maksimalna veličina prijenosa",
+"max. possible: " => "maksimalna moguća: ",
+"Needed for multi-file and folder downloads." => "Potrebno za preuzimanje više datoteke i mape",
+"Enable ZIP-download" => "Omogući ZIP-preuzimanje",
+"0 is unlimited" => "0 je \"bez limita\"",
+"Maximum input size for ZIP files" => "Maksimalna veličina za ZIP datoteke",
+"New" => "novo",
+"Text file" => "tekstualna datoteka",
+"Folder" => "mapa",
+"From url" => "od URL-a",
+"Upload" => "Pošalji",
+"Cancel upload" => "Prekini upload",
+"Nothing in here. Upload something!" => "Nema ničega u ovoj mapi. Pošalji nešto!",
+"Name" => "Naziv",
+"Share" => "podjeli",
+"Download" => "Preuzmi",
 "Delete" => "Briši",
 "Upload too large" => "Prijenos je preobiman",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju.",
+"Files are being scanned, please wait." => "Datoteke se skeniraju, molimo pričekajte.",
+"Current scanning" => "Trenutno skeniranje"
 );
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 6d9e67794b..41255cb409 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Hiányzik az ideiglenes könyvtár",
 "Failed to write to disk" => "Nem írható lemezre",
 "Files" => "Fájlok",
+"Size" => "Méret",
+"Modified" => "Módosítva",
 "File handling" => "Fájlkezelés",
 "Maximum upload size" => "Maximális feltölthető fájlméret",
 "max. possible: " => "max. lehetséges",
@@ -24,9 +26,6 @@
 "Name" => "Név",
 "Share" => "Megosztás",
 "Download" => "Letöltés",
-"Size" => "Méret",
-"Modified" => "Módosítva",
-"Delete all" => "Mindent töröl",
 "Delete" => "Törlés",
 "Upload too large" => "Feltöltés túl nagy",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "A fájlokat amit próbálsz feltölteni meghaladta a legnagyobb fájlméretet ezen a szerveren.",
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index 8753b871c9..645eba48a1 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -2,6 +2,8 @@
 "The uploaded file was only partially uploaded" => "Le file incargate solmente esseva incargate partialmente",
 "No file was uploaded" => "Nulle file esseva incargate",
 "Files" => "Files",
+"Size" => "Dimension",
+"Modified" => "Modificate",
 "Maximum upload size" => "Dimension maxime de incargamento",
 "New" => "Nove",
 "Text file" => "File de texto",
@@ -10,8 +12,6 @@
 "Nothing in here. Upload something!" => "Nihil hic. Incarga alcun cosa!",
 "Name" => "Nomine",
 "Download" => "Discargar",
-"Size" => "Dimension",
-"Modified" => "Modificate",
 "Delete" => "Deler",
 "Upload too large" => "Incargamento troppo longe"
 );
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 902eeeb4ec..1f9dc3290a 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -1,13 +1,32 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Tidak ada galat, berkas sukses diunggah",
+"The uploaded file was only partially uploaded" => "Berkas hanya diunggah sebagian",
+"No file was uploaded" => "Tidak ada berkas yang diunggah",
+"Missing a temporary folder" => "Kehilangan folder temporer",
+"Failed to write to disk" => "Gagal menulis ke disk",
 "Files" => "Berkas",
-"Maximum upload size" => "Ukuran unggah maksimum",
-"Upload" => "Unggah",
-"Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!",
-"Name" => "Nama",
-"Download" => "Unduh",
 "Size" => "Ukuran",
 "Modified" => "Dimodifikasi",
+"File handling" => "Penanganan berkas",
+"Maximum upload size" => "Ukuran unggah maksimum",
+"max. possible: " => "Kemungkinan maks:",
+"Needed for multi-file and folder downloads." => "Dibutuhkan untuk multi-berkas dan unduhan folder",
+"Enable ZIP-download" => "Aktifkan unduhan ZIP",
+"0 is unlimited" => "0 adalah tidak terbatas",
+"Maximum input size for ZIP files" => "Ukuran masukan maksimal untuk berkas ZIP",
+"New" => "Baru",
+"Text file" => "Berkas teks",
+"Folder" => "Folder",
+"From url" => "Dari url",
+"Upload" => "Unggah",
+"Cancel upload" => "Batal mengunggah",
+"Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!",
+"Name" => "Nama",
+"Share" => "Bagikan",
+"Download" => "Unduh",
 "Delete" => "Hapus",
 "Upload too large" => "Unggahan terlalu besar",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang anda coba unggah melebihi ukuran maksimum untuk pengunggahan berkas di server ini."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang anda coba unggah melebihi ukuran maksimum untuk pengunggahan berkas di server ini.",
+"Files are being scanned, please wait." => "Berkas sedang dipindai, silahkan tunggu.",
+"Current scanning" => "Sedang memindai"
 );
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 53642636ed..82871826c1 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Cartella temporanea mancante",
 "Failed to write to disk" => "Scrittura su disco non riuscita",
 "Files" => "File",
+"Size" => "Dimensione",
+"Modified" => "Modificato",
 "File handling" => "Gestione file",
 "Maximum upload size" => "Dimensione massima upload",
 "max. possible: " => "numero mass.: ",
@@ -24,9 +26,6 @@
 "Name" => "Nome",
 "Share" => "Condividi",
 "Download" => "Scarica",
-"Size" => "Dimensione",
-"Modified" => "Modificato",
-"Delete all" => "Elimina tutto",
 "Delete" => "Elimina",
 "Upload too large" => "Il file caricato è troppo grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index cd89423b74..c04d0836df 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -1,22 +1,34 @@
 <?php $TRANSLATIONS = array(
-"There is no error, the file uploaded with success" => "エラーはありません。ファイルのアップロードは成功しました。",
+"There is no error, the file uploaded with success" => "エラーはありません。ファイルのアップロードは成功しました",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "アップロードされたファイルはphp.iniのupload_max_filesizeに設定されたサイズを超えています",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "アップロードされたファイルはHTMLのフォームに設定されたMAX_FILE_SIZEに設定されたサイズを超えています",
 "The uploaded file was only partially uploaded" => "ファイルは一部分しかアップロードされませんでした",
 "No file was uploaded" => "ファイルはアップロードされませんでした",
 "Missing a temporary folder" => "テンポラリフォルダが見つかりません",
+"Failed to write to disk" => "ディスクへの書き込みに失敗しました",
 "Files" => "ファイル",
-"Maximum upload size" => "最大アップロードサイズ",
-"New" => "新規作成",
-"Text file" => "テキストファイル",
-"Folder" => "フォルダ",
-"Upload" => "アップロード",
-"Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",
-"Name" => "名前",
-"Download" => "ダウンロード",
 "Size" => "サイズ",
 "Modified" => "更新日時",
+"File handling" => "ファイル操作",
+"Maximum upload size" => "最大アップロードサイズ",
+"max. possible: " => "最大容量: ",
+"Needed for multi-file and folder downloads." => "複数ファイルおよびフォルダのダウンロードに必要",
+"Enable ZIP-download" => "ZIP形式のダウンロードを有効にする",
+"0 is unlimited" => "0を指定した場合は無制限",
+"Maximum input size for ZIP files" => "ZIPファイルへの最大入力サイズ",
+"New" => "新規",
+"Text file" => "テキストファイル",
+"Folder" => "フォルダ",
+"From url" => "URL",
+"Upload" => "アップロード",
+"Cancel upload" => "アップロードをキャンセル",
+"Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",
+"Name" => "名前",
+"Share" => "共有",
+"Download" => "ダウンロード",
 "Delete" => "削除",
 "Upload too large" => "ファイルサイズが大きすぎます",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルはサーバで規定された最大サイズを超えています"
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。",
+"Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。",
+"Current scanning" => "スキャン中"
 );
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index d519df714e..70575f0975 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "임시 폴더가 사라짐",
 "Failed to write to disk" => "디스크에 쓰지 못했습니다",
 "Files" => "파일",
+"Size" => "크기",
+"Modified" => "수정됨",
 "File handling" => "파일 처리",
 "Maximum upload size" => "최대 업로드 크기",
 "max. possible: " => "최대. 가능한:",
@@ -24,9 +26,6 @@
 "Name" => "이름",
 "Share" => "공유",
 "Download" => "다운로드",
-"Size" => "크기",
-"Modified" => "수정됨",
-"Delete all" => "모두 삭제",
 "Delete" => "삭제",
 "Upload too large" => "업로드 용량 초과",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.",
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index 43956fcd63..548ef4895d 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -5,15 +5,30 @@
 "The uploaded file was only partially uploaded" => "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn",
 "No file was uploaded" => "Et ass keng Datei ropgelueden ginn",
 "Missing a temporary folder" => "Et feelt en temporären Dossier",
+"Failed to write to disk" => "Konnt net op den Disk schreiwen",
 "Files" => "Dateien",
-"Maximum upload size" => "Maximum Upload Gréisst ",
-"Upload" => "Eroplueden",
-"Nothing in here. Upload something!" => "Hei ass näischt. Lued eppes rop!",
-"Name" => "Numm",
-"Download" => "Eroflueden",
 "Size" => "Gréisst",
 "Modified" => "Geännert",
+"File handling" => "Fichier handling",
+"Maximum upload size" => "Maximum Upload Gréisst ",
+"max. possible: " => "max. méiglech:",
+"Needed for multi-file and folder downloads." => "Gett gebraucht fir multi-Fichier an Dossier Downloads.",
+"Enable ZIP-download" => "ZIP-download erlaben",
+"0 is unlimited" => "0 ass onlimitéiert",
+"Maximum input size for ZIP files" => "Maximal Gréisst fir ZIP Fichieren",
+"New" => "Nei",
+"Text file" => "Text Fichier",
+"Folder" => "Dossier",
+"From url" => "From URL",
+"Upload" => "Eroplueden",
+"Cancel upload" => "Upload ofbriechen",
+"Nothing in here. Upload something!" => "Hei ass näischt. Lued eppes rop!",
+"Name" => "Numm",
+"Share" => "Share",
+"Download" => "Eroflueden",
 "Delete" => "Läschen",
 "Upload too large" => "Upload ze grouss",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.",
+"Files are being scanned, please wait." => "Fichieren gi gescannt, war weg.",
+"Current scanning" => "Momentane Scan"
 );
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index 24a16515f6..e876e743a4 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -5,17 +5,21 @@
 "The uploaded file was only partially uploaded" => "Failas buvo įkeltas tik dalinai",
 "No file was uploaded" => "Nebuvo įkeltas nė vienas failas",
 "Missing a temporary folder" => "Nėra laikinojo katalogo",
+"Failed to write to disk" => "Nepavyko įrašyti į diską",
 "Files" => "Failai",
+"Size" => "Dydis",
+"Modified" => "Pakeista",
 "Maximum upload size" => "Maksimalus failo dydis",
 "New" => "Naujas",
 "Text file" => "Teksto failas",
 "Folder" => "Katalogas",
+"From url" => "Iš adreso",
 "Upload" => "Įkelti",
+"Cancel upload" => "Atšaukti siuntimą",
 "Nothing in here. Upload something!" => "Čia tuščia. Įkelkite ką nors!",
 "Name" => "Pavadinimas",
+"Share" => "Dalintis",
 "Download" => "Atsisiųsti",
-"Size" => "Dydis",
-"Modified" => "Pakeista",
 "Delete" => "Ištrinti",
 "Upload too large" => "Įkėlimui failas per didelis",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų leidžiamą šiame serveryje"
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index f32d6a237e..d3efa4d022 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Не постои привремена папка",
 "Failed to write to disk" => "Неуспеав да запишам на диск",
 "Files" => "Датотеки",
+"Size" => "Големина",
+"Modified" => "Променето",
 "File handling" => "Ракување со датотеки",
 "Maximum upload size" => "Максимална големина за подигање",
 "max. possible: " => "макс. можно:",
@@ -24,9 +26,6 @@
 "Name" => "Име",
 "Share" => "Сподели",
 "Download" => "Преземи",
-"Size" => "Големина",
-"Modified" => "Променето",
-"Delete all" => "Избриши сѐ",
 "Delete" => "Избриши",
 "Upload too large" => "Датотеката е премногу голема",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.",
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index 432079baec..1a1d72a01b 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -6,6 +6,8 @@
 "No file was uploaded" => "Tiada fail yang dimuat naik",
 "Missing a temporary folder" => "Folder sementara hilang",
 "Files" => "fail",
+"Size" => "Saiz",
+"Modified" => "Dimodifikasi",
 "Maximum upload size" => "Saiz maksimum muat naik",
 "New" => "Baru",
 "Text file" => "Fail teks",
@@ -14,8 +16,6 @@
 "Nothing in here. Upload something!" => "Tiada apa-apa di sini. Muat naik sesuatu!",
 "Name" => "Nama ",
 "Download" => "Muat turun",
-"Size" => "Saiz",
-"Modified" => "Dimodifikasi",
 "Delete" => "Padam",
 "Upload too large" => "Muat naik terlalu besar",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server"
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 70ed95019b..0f4cc33ae3 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Mangler en midlertidig mappe",
 "Failed to write to disk" => "Klarte ikke å skrive til disk",
 "Files" => "Filer",
+"Size" => "Størrelse",
+"Modified" => "Endret",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimum opplastingsstørrelse",
 "max. possible: " => "max. mulige:",
@@ -24,9 +26,6 @@
 "Name" => "Navn",
 "Share" => "Del",
 "Download" => "Last ned",
-"Size" => "Størrelse",
-"Modified" => "Endret",
-"Delete all" => "Slett alle",
 "Delete" => "Slett",
 "Upload too large" => "Opplasting for stor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index e7f32b835b..119f6034f1 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Een tijdelijke map mist",
 "Failed to write to disk" => "Schrijven naar schijf mislukt",
 "Files" => "Bestanden",
+"Size" => "Bestandsgrootte",
+"Modified" => "Laatst aangepast",
 "File handling" => "Bestand",
 "Maximum upload size" => "Maximale bestandsgrootte voor uploads",
 "max. possible: " => "max. mogelijk: ",
@@ -24,9 +26,6 @@
 "Name" => "Naam",
 "Share" => "Delen",
 "Download" => "Download",
-"Size" => "Bestandsgrootte",
-"Modified" => "Laatst aangepast",
-"Delete all" => "Alles verwijderen",
 "Delete" => "Verwijder",
 "Upload too large" => "Bestanden te groot",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server.",
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index f3302b7a53..002e85de5c 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -6,6 +6,8 @@
 "No file was uploaded" => "Ingen filer vart lasta opp",
 "Missing a temporary folder" => "Manglar ei mellombels mappe",
 "Files" => "Filer",
+"Size" => "Storleik",
+"Modified" => "Endra",
 "Maximum upload size" => "Maksimal opplastingsstorleik",
 "New" => "Ny",
 "Text file" => "Tekst fil",
@@ -14,8 +16,6 @@
 "Nothing in here. Upload something!" => "Ingenting her. Last noko opp!",
 "Name" => "Namn",
 "Download" => "Last ned",
-"Size" => "Storleik",
-"Modified" => "Endra",
 "Delete" => "Slett",
 "Upload too large" => "For stor opplasting",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren."
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 80b35f0825..bfdd04659d 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -5,18 +5,30 @@
 "The uploaded file was only partially uploaded" => "Plik przesłano tylko częściowo",
 "No file was uploaded" => "Nie przesłano żadnego pliku",
 "Missing a temporary folder" => "Brak katalogu tymczasowego",
+"Failed to write to disk" => "Błąd zapisu na dysk",
 "Files" => "Pliki",
+"Size" => "Rozmiar",
+"Modified" => "Czas modyfikacji",
+"File handling" => "Zarządzanie plikami",
 "Maximum upload size" => "Maksymalny rozmiar wysyłanego pliku",
+"max. possible: " => "max. możliwych",
+"Needed for multi-file and folder downloads." => "Wymagany do pobierania wielu plików i folderów",
+"Enable ZIP-download" => "Włącz pobieranie ZIP-paczki",
+"0 is unlimited" => "0 jest nielimitowane",
+"Maximum input size for ZIP files" => "Maksymalna wielkość pliku wejściowego ZIP ",
 "New" => "Nowy",
 "Text file" => "Plik tekstowy",
 "Folder" => "Katalog",
+"From url" => "Z adresu",
 "Upload" => "Prześlij",
+"Cancel upload" => "Przestań wysyłać",
 "Nothing in here. Upload something!" => "Brak zawartości. Proszę wysłać pliki!",
 "Name" => "Nazwa",
+"Share" => "Współdziel",
 "Download" => "Pobiera element",
-"Size" => "Rozmiar",
-"Modified" => "Czas modyfikacji",
 "Delete" => "Usuwa element",
 "Upload too large" => "Wysyłany plik ma za duży rozmiar",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki które próbujesz przesłać, przekraczają maksymalną, dopuszczalną wielkość."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki które próbujesz przesłać, przekraczają maksymalną, dopuszczalną wielkość.",
+"Files are being scanned, please wait." => "Skanowanie plików, proszę czekać.",
+"Current scanning" => "Aktualnie skanowane"
 );
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index e4bb5e1f26..b70406f517 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Pasta temporária não encontrada",
 "Failed to write to disk" => "Falha ao escrever no disco",
 "Files" => "Arquivos",
+"Size" => "Tamanho",
+"Modified" => "Modificado",
 "File handling" => "Tratamento de Arquivo",
 "Maximum upload size" => "Tamanho máximo para carregar",
 "max. possible: " => "max. possível:",
@@ -24,9 +26,6 @@
 "Name" => "Nome",
 "Share" => "Compartilhar",
 "Download" => "Baixar",
-"Size" => "Tamanho",
-"Modified" => "Modificado",
-"Delete all" => "Deletar Tudo",
 "Delete" => "Excluir",
 "Upload too large" => "Arquivo muito grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 9ac764d959..ac22430282 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -5,18 +5,30 @@
 "The uploaded file was only partially uploaded" => "O ficheiro enviado só foi enviado parcialmente",
 "No file was uploaded" => "Não foi enviado nenhum ficheiro",
 "Missing a temporary folder" => "Falta uma pasta temporária",
+"Failed to write to disk" => "Falhou a escrita no disco",
 "Files" => "Ficheiros",
+"Size" => "Tamanho",
+"Modified" => "Modificado",
+"File handling" => "Manuseamento de ficheiros",
 "Maximum upload size" => "Tamanho máximo de envio",
+"max. possible: " => "max. possivel: ",
+"Needed for multi-file and folder downloads." => "Necessário para multi download de ficheiros e pastas",
+"Enable ZIP-download" => "Ativar dowload de ficheiros ZIP",
+"0 is unlimited" => "0 é ilimitado",
+"Maximum input size for ZIP files" => "Tamanho máximo para ficheiros ZIP",
 "New" => "Novo",
 "Text file" => "Ficheiro de texto",
 "Folder" => "Pasta",
+"From url" => "Do endereço",
 "Upload" => "Enviar",
+"Cancel upload" => "Cancelar upload",
 "Nothing in here. Upload something!" => "Vazio. Envia alguma coisa!",
 "Name" => "Nome",
+"Share" => "Partilhar",
 "Download" => "Transferir",
-"Size" => "Tamanho",
-"Modified" => "Modificado",
 "Delete" => "Apagar",
 "Upload too large" => "Envio muito grande",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que estás a tentar enviar excedem o tamanho máximo de envio neste servidor."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que estás a tentar enviar excedem o tamanho máximo de envio neste servidor.",
+"Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.",
+"Current scanning" => "Análise actual"
 );
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index 307d67d66c..e6f0294fd3 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -5,18 +5,30 @@
 "The uploaded file was only partially uploaded" => "Fișierul a fost încărcat doar parțial",
 "No file was uploaded" => "Niciun fișier încărcat",
 "Missing a temporary folder" => "Lipsește un dosar temporar",
+"Failed to write to disk" => "Eroare la scriere pe disc",
 "Files" => "Fișiere",
+"Size" => "Dimensiune",
+"Modified" => "Modificat",
+"File handling" => "Manipulare fișiere",
 "Maximum upload size" => "Dimensiune maximă admisă la încărcare",
+"max. possible: " => "max. posibil:",
+"Needed for multi-file and folder downloads." => "Necesar pentru descărcarea mai multor fișiere și a dosarelor",
+"Enable ZIP-download" => "Activează descărcare fișiere compresate",
+"0 is unlimited" => "0 e nelimitat",
+"Maximum input size for ZIP files" => "Dimensiunea maximă de intrare pentru fișiere compresate",
 "New" => "Nou",
 "Text file" => "Fișier text",
 "Folder" => "Dosar",
+"From url" => "De la URL",
 "Upload" => "Încarcă",
+"Cancel upload" => "Anulează încărcarea",
 "Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!",
 "Name" => "Nume",
+"Share" => "Partajează",
 "Download" => "Descarcă",
-"Size" => "Dimensiune",
-"Modified" => "Modificat",
 "Delete" => "Șterge",
 "Upload too large" => "Fișierul încărcat este prea mare",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server.",
+"Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteptă.",
+"Current scanning" => "În curs de scanare"
 );
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index d531d2589c..45648012a1 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -5,18 +5,30 @@
 "The uploaded file was only partially uploaded" => "Файл был загружен не полностью",
 "No file was uploaded" => "Файл не был загружен",
 "Missing a temporary folder" => "Невозможно найти временную папку",
+"Failed to write to disk" => "Ошибка записи на диск",
 "Files" => "Файлы",
+"Size" => "Размер",
+"Modified" => "Изменен",
+"File handling" => "Управление файлами",
 "Maximum upload size" => "Максимальный размер файла",
+"max. possible: " => "макс. возможно: ",
+"Needed for multi-file and folder downloads." => "Требуется для загрузки нескольких файорв и папок",
+"Enable ZIP-download" => "Включить ZIP-загрузку",
+"0 is unlimited" => "0 - без ограничений",
+"Maximum input size for ZIP files" => "Максимальный исходный размер для ZIP файлов",
 "New" => "Новый",
 "Text file" => "Текстовый файл",
 "Folder" => "Папка",
+"From url" => "С url",
 "Upload" => "Закачать",
+"Cancel upload" => "Отмена закачки",
 "Nothing in here. Upload something!" => "Здесь ничего нет. Закачайте что-нибудь!",
 "Name" => "Название",
+"Share" => "Поделиться",
 "Download" => "Скачать",
-"Size" => "Размер",
-"Modified" => "Изменен",
 "Delete" => "Удалить",
 "Upload too large" => "Файл слишком большой",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые Вы пытаетесь закачать, превышают лимит для файлов на этом сервере."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые Вы пытаетесь закачать, превышают лимит для файлов на этом сервере.",
+"Files are being scanned, please wait." => "Подождите, файлы сканируются.",
+"Current scanning" => "Текущее сканирование"
 );
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index a4e14e6bb8..2a7e84af6c 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Chýbajúci dočasný priečinok",
 "Failed to write to disk" => "Zápis na disk sa nepodaril",
 "Files" => "Súbory",
+"Size" => "Veľkosť",
+"Modified" => "Upravené",
 "File handling" => "Nastavenie správanie k súborom",
 "Maximum upload size" => "Maximálna veľkosť nahratia",
 "max. possible: " => "najväčšie možné:",
@@ -24,9 +26,6 @@
 "Name" => "Meno",
 "Share" => "Zdielať",
 "Download" => "Stiahnuť",
-"Size" => "Veľkosť",
-"Modified" => "Upravené",
-"Delete all" => "Odstrániť všetko",
 "Delete" => "Odstrániť",
 "Upload too large" => "Nahrávanie príliš veľké",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory ktoré sa snažíte nahrať presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 8969a3f092..b0ea2dc373 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Manjka začasna mapa",
 "Failed to write to disk" => "Pisanje na disk je spodletelo",
 "Files" => "Datoteke",
+"Size" => "Velikost",
+"Modified" => "Spremenjeno",
 "File handling" => "Rokovanje z datotekami",
 "Maximum upload size" => "Največja velikost za nalaganje",
 "max. possible: " => "največ mogoče:",
@@ -24,9 +26,6 @@
 "Name" => "Ime",
 "Share" => "Souporaba",
 "Download" => "Prejmi",
-"Size" => "Velikost",
-"Modified" => "Spremenjeno",
-"Delete all" => "Izbriši vse",
 "Delete" => "Izbriši",
 "Upload too large" => "Nalaganje ni mogoče, ker je preveliko",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite naložiti, presegajo največjo dovoljeno velikost na tem strežniku.",
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index bd70ab02c8..68c50d5282 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -6,6 +6,8 @@
 "No file was uploaded" => "Ниједан фајл није послат",
 "Missing a temporary folder" => "Недостаје привремена фасцикла",
 "Files" => "Фајлови",
+"Size" => "Величина",
+"Modified" => "Задња измена",
 "Maximum upload size" => "Максимална величина пошиљке",
 "New" => "Нови",
 "Text file" => "текстуални фајл",
@@ -14,8 +16,6 @@
 "Nothing in here. Upload something!" => "Овде нема ничег. Пошаљите нешто!",
 "Name" => "Име",
 "Download" => "Преузми",
-"Size" => "Величина",
-"Modified" => "Задња измена",
 "Delete" => "Обриши",
 "Upload too large" => "Пошиљка је превелика",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Фајлови које желите да пошаљете превазилазе ограничење максималне величине пошиљке на овом серверу."
diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php
index 1b5addbc57..63843fc8b5 100644
--- a/apps/files/l10n/sr@latin.php
+++ b/apps/files/l10n/sr@latin.php
@@ -6,13 +6,13 @@
 "No file was uploaded" => "Nijedan fajl nije poslat",
 "Missing a temporary folder" => "Nedostaje privremena fascikla",
 "Files" => "Fajlovi",
+"Size" => "Veličina",
+"Modified" => "Zadnja izmena",
 "Maximum upload size" => "Maksimalna veličina pošiljke",
 "Upload" => "Pošalji",
 "Nothing in here. Upload something!" => "Ovde nema ničeg. Pošaljite nešto!",
 "Name" => "Ime",
 "Download" => "Preuzmi",
-"Size" => "Veličina",
-"Modified" => "Zadnja izmena",
 "Delete" => "Obriši",
 "Upload too large" => "Pošiljka je prevelika",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru."
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 1c83ab6c0b..f508f22f3c 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -5,18 +5,30 @@
 "The uploaded file was only partially uploaded" => "Den uppladdade filen var endast delvist uppladdad",
 "No file was uploaded" => "Ingen fil blev uppladdad",
 "Missing a temporary folder" => "Saknar en tillfällig mapp",
+"Failed to write to disk" => "Misslyckades spara till disk",
 "Files" => "Filer",
-"Maximum upload size" => "Maximal storlek att lägga upp",
+"Size" => "Storlek",
+"Modified" => "Ändrad",
+"File handling" => "Filhantering",
+"Maximum upload size" => "Maximal storlek att ladda upp",
+"max. possible: " => "max. möjligt:",
+"Needed for multi-file and folder downloads." => "Krävs för nerladdning av flera mappar och filer",
+"Enable ZIP-download" => "Aktivera ZIP-nerladdning",
+"0 is unlimited" => "0 är lika med oändligt",
+"Maximum input size for ZIP files" => "Största tillåtna storlek för ZIP filer",
 "New" => "Ny",
 "Text file" => "Textfil",
 "Folder" => "Mapp",
+"From url" => "Från webbadress",
 "Upload" => "Ladda upp",
+"Cancel upload" => "Avbryt uppladdning",
 "Nothing in here. Upload something!" => "Ingenting här. Ladda upp något!",
 "Name" => "Namn",
+"Share" => "Dela",
 "Download" => "Ladda ned",
-"Size" => "Storlek",
-"Modified" => "Ändrad",
 "Delete" => "Ta bort",
 "Upload too large" => "För stor uppladdning",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",
+"Files are being scanned, please wait." => "Filerna skannas, var god vänta",
+"Current scanning" => "Aktuell avsökning"
 );
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 9b446125a3..ec538262e0 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "แฟ้มเอกสารชั่วคราวเกิดการสูญหาย",
 "Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
 "Files" => "ไฟล์",
+"Size" => "ขนาด",
+"Modified" => "ปรับปรุงล่าสุด",
 "File handling" => "การจัดกาไฟล์",
 "Maximum upload size" => "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
 "max. possible: " => "จำนวนสูงสุดที่สามารถทำได้: ",
@@ -24,9 +26,6 @@
 "Name" => "ชื่อ",
 "Share" => "แชร์",
 "Download" => "ดาวน์โหลด",
-"Size" => "ขนาด",
-"Modified" => "ปรับปรุงล่าสุด",
-"Delete all" => "ลบทั้งหมด",
 "Delete" => "ลบ",
 "Upload too large" => "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index d8d32e226c..b8de8249a1 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Geçici bir klasör eksik",
 "Failed to write to disk" => "Diske yazılamadı",
 "Files" => "Dosyalar",
+"Size" => "Boyut",
+"Modified" => "Değiştirilme",
 "File handling" => "Dosya taşıma",
 "Maximum upload size" => "Maksimum yükleme boyutu",
 "max. possible: " => "mümkün olan en fazla: ",
@@ -24,9 +26,6 @@
 "Name" => "Ad",
 "Share" => "Paylaş",
 "Download" => "İndir",
-"Size" => "Boyut",
-"Modified" => "Değiştirilme",
-"Delete all" => "Hepsini sil",
 "Delete" => "Sil",
 "Upload too large" => "Yüklemeniz çok büyük",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor.",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 37e1c4b838..8b21cb26a3 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -6,6 +6,8 @@
 "No file was uploaded" => "Не відвантажено жодного файлу",
 "Missing a temporary folder" => "Відсутній тимчасовий каталог",
 "Files" => "Файли",
+"Size" => "Розмір",
+"Modified" => "Змінено",
 "Maximum upload size" => "Максимальний розмір відвантажень",
 "New" => "Створити",
 "Text file" => "Текстовий файл",
@@ -14,8 +16,6 @@
 "Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",
 "Name" => "Ім'я",
 "Download" => "Завантажити",
-"Size" => "Розмір",
-"Modified" => "Змінено",
 "Delete" => "Видалити",
 "Upload too large" => "Файл занадто великий",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері."
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 748c789799..c2e6541f2a 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "缺少临时目录",
 "Failed to write to disk" => "写入磁盘失败",
 "Files" => "文件",
+"Size" => "大小",
+"Modified" => "修改日期",
 "File handling" => "文件处理",
 "Maximum upload size" => "最大上传大小",
 "max. possible: " => "最大可能: ",
@@ -24,9 +26,6 @@
 "Name" => "名称",
 "Share" => "共享",
 "Download" => "下载",
-"Size" => "大小",
-"Modified" => "修改日期",
-"Delete all" => "删除所有",
 "Delete" => "删除",
 "Upload too large" => "上传文件过大",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正尝试上传的文件超过了此服务器可以上传的最大大小",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 2ff343b0f3..91a1344ca3 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -7,7 +7,15 @@
 "Missing a temporary folder" => "遺失暫存資料夾",
 "Failed to write to disk" => "寫入硬碟失敗",
 "Files" => "檔案",
+"Size" => "大小",
+"Modified" => "修改",
+"File handling" => "檔案處理",
 "Maximum upload size" => "最大上傳容量",
+"max. possible: " => "最大允許: ",
+"Needed for multi-file and folder downloads." => "針對多檔案和目錄下載是必填的",
+"Enable ZIP-download" => "啟用 Zip 下載",
+"0 is unlimited" => "0代表沒有限制",
+"Maximum input size for ZIP files" => "針對ZIP檔案最大輸入大小",
 "New" => "新增",
 "Text file" => "文字檔",
 "Folder" => "資料夾",
@@ -18,10 +26,9 @@
 "Name" => "名稱",
 "Share" => "分享",
 "Download" => "下載",
-"Size" => "大小",
-"Modified" => "修改",
-"Delete all" => "全部刪除",
 "Delete" => "刪除",
 "Upload too large" => "上傳過大",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "你試圖上傳的檔案已超過伺服器的最大容量限制。　"
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "你試圖上傳的檔案已超過伺服器的最大容量限制。　",
+"Files are being scanned, please wait." => "正在掃描檔案，請稍等。",
+"Current scanning" => "目前掃描"
 );
diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php
index c89070ce52..23021ec664 100644
--- a/apps/files/templates/admin.php
+++ b/apps/files/templates/admin.php
@@ -3,7 +3,7 @@
 <form name="filesForm" action='#' method='post'>
 	<fieldset class="personalblock">
 		<legend><strong><?php echo $l->t('File handling');?></strong></legend>
-		<?php if($_['htaccessWorking']):?>
+		<?php if($_['uploadChangable']):?>
 			<label for="maxUploadSize"><?php echo $l->t( 'Maximum upload size' ); ?> </label><input name='maxUploadSize' id="maxUploadSize" value='<?php echo $_['uploadMaxFilesize'] ?>'/>(<?php echo $l->t('max. possible: '); echo $_['maxPossibleUploadSize'] ?>)<br/>
 		<?php endif;?>
 		<input type="checkbox" name="allowZipDownload" id="allowZipDownload" value="1" title="<?php echo $l->t( 'Needed for multi-file and folder downloads.' ); ?>"<?php if ($_['allowZipDownload']) echo ' checked="checked"'; ?> /> <label for="allowZipDownload"><?php echo $l->t( 'Enable ZIP-download' ); ?></label> <br/>
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index c0a40081fe..3bd5a1ceef 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -53,7 +53,7 @@
 				</span>
 			</th>
 			<th id="headerSize"><?php echo $l->t( 'Size' ); ?></th>
-			<th id="headerDate"><span id="modified"><?php echo $l->t( 'Modified' ); ?></span><span class="selectedActions"><a href="" class="delete"><?php echo $l->t('Delete all')?> <img class="svg" alt="<?php echo $l->t('Delete')?>" src="<?php echo OCP\image_path("core", "actions/delete.svg"); ?>" /></a></span></th>
+			<th id="headerDate"><span id="modified"><?php echo $l->t( 'Modified' ); ?></span><span class="selectedActions"><a href="" class="delete"><?php echo $l->t('Delete')?> <img class="svg" alt="<?php echo $l->t('Delete')?>" src="<?php echo OCP\image_path("core", "actions/delete.svg"); ?>" /></a></span></th>
 		</tr>
 	</thead>
 	<tbody id="fileList" data-readonly="<?php echo $_['readonly'];?>">
diff --git a/apps/files_imageviewer/js/lightbox.js b/apps/files_imageviewer/js/lightbox.js
index fe8b975309..69cda7a0ec 100644
--- a/apps/files_imageviewer/js/lightbox.js
+++ b/apps/files_imageviewer/js/lightbox.js
@@ -22,10 +22,10 @@ function viewImage(dir, file) {
 	if(file.indexOf('.psd')>0){//can't view those
 		return;
 	}
-	var location=OC.filePath('files','ajax','download.php')+'?files='+file+'&dir='+dir;
+	var location=OC.filePath('files','ajax','download.php')+'?files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir);
 	$.fancybox({
 		"href": location,
-		"title": file,
+		"title": file.replace(/</, "&lt;").replace(/>/, "&gt;"),
 		"titlePosition": "inside"
 	});
 }
diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 9d168c1c4f..70bb74a910 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -67,7 +67,7 @@ function setSyntaxMode(ext){
 function showControls(filename,writeperms){
 	// Loads the control bar at the top.
 	// Load the new toolbar.
-	var editorbarhtml = '<div id="editorcontrols" style="display: none;"><div class="crumb svg last" id="breadcrumb_file" style="background-image:url(&quot;'+OC.imagePath('core','breadcrumb.png')+'&quot;)"><p>'+filename+'</p></div>';
+	var editorbarhtml = '<div id="editorcontrols" style="display: none;"><div class="crumb svg last" id="breadcrumb_file" style="background-image:url(&quot;'+OC.imagePath('core','breadcrumb.png')+'&quot;)"><p>'+filename.replace(/</, "&lt;").replace(/>/, "&gt;")+'</p></div>';
 	if(writeperms=="true"){
 		editorbarhtml += '<button id="editor_save">'+t('files_texteditor','Save')+'</button><div class="separator"></div>';
 	}
diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
index 1d107c1bda..bee6054333 100644
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@ -10,7 +10,14 @@ $source = strip_tags( $source );
 if( OCA_Versions\Storage::isversioned( $source ) ) {
 
 	$count=5; //show the newest revisions
-	$versions = OCA_Versions\Storage::getversions( $source, $count);
+	$versions = OCA_Versions\Storage::getVersions( $source, $count);
+	$versionsFormatted = array();
+	
+	foreach ( $versions AS $version ) {
+	
+		$versionsFormatted[] = OCP\Util::formatDate( $version );
+		
+	}
 
 	$versionsSorted = array_reverse( $versions );
 	
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index 11c07ef86c..cb4726e8d0 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -54,7 +54,7 @@ if ( isset( $_GET['path'] ) ) {
         if( OCA_Versions\Storage::isversioned( $path ) ) {
 	
 		$count = 999; //show the newest revisions
-	        $versions = OCA_Versions\Storage::getversions( $path, $count );
+	        $versions = OCA_Versions\Storage::getVersions( $path, $count);
 
 		$tmpl->assign( 'versions', array_reverse( $versions ) );
 		
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index 5e46b2a0ee..82d569fa0f 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -33,7 +33,7 @@ $(document).ready(function(){
 });
 
 function createVersionsDropdown(filename, files) {
-	
+
 	var historyUrl = OC.linkTo('files_versions', 'history.php') + '?path='+encodeURIComponent( $( '#dir' ).val() ).replace( /%2F/g, '/' )+'/'+encodeURIComponent( filename );
 	
 	var html = '<div id="dropdown" class="drop" data-file="'+files+'">';
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index 58fea75a0d..13e104152b 100644
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -22,8 +22,10 @@ if( isset( $_['message'] ) ) {
 	foreach ( $_['versions'] as $v ) {
 	
 		echo ' ';
-		echo OCP\Util::formatDate( $v );
-		echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php').'?path='.urlencode( $_['path'] ).'&revert='. $v .'" class="button">Revert</a><br /><br />';
+		echo OCP\Util::formatDate( $v['version'] );
+		echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php').'?path='.urlencode( $_['path'] ).'&revert='. $v['version'] .'" class="button">Revert</a><br /><br />';
+		if ( $v['cur'] ) { echo '  (<b>Current</b>)'; }
+		echo '<br /><br />';
 		
 	}
 
diff --git a/apps/files_versions/versions.php b/apps/files_versions/versions.php
index f39b5a7f4e..44ce7c635a 100644
--- a/apps/files_versions/versions.php
+++ b/apps/files_versions/versions.php
@@ -27,7 +27,6 @@ class Storage {
 	//
 	// todo:
 	//   - port to oc_filesystem to enable network transparency
-	//   - check if it works well together with encryption
 	//   - implement expire all function. And find a place to call it ;-)
 	//   - add transparent compression. first test if it´s worth it.
 
@@ -35,7 +34,7 @@ class Storage {
 	const DEFAULTFOLDER='versions'; 
 	const DEFAULTBLACKLIST='avi mp3 mpg mp4 ctmp'; 
 	const DEFAULTMAXFILESIZE=1048576; // 10MB 
-	const DEFAULTMININTERVAL=120; // 2 min
+	const DEFAULTMININTERVAL=1; // 2 min
 	const DEFAULTMAXVERSIONS=50; 
 
 	/**
@@ -76,7 +75,7 @@ class Storage {
 			} else {
 				$uid = \OCP\User::getUser();
 			}
-			$versionsfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 			$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';
 			Storage::init();
 
@@ -103,7 +102,7 @@ class Storage {
 
 			// check mininterval if the file is being modified by the owner (all shared files should be versioned despite mininterval)
 			if ($uid == \OCP\User::getUser()) {
-				$matches=glob($versionsfoldername.'/'.$filename.'.v*');
+				$matches=glob($versionsFolderName.'/'.$filename.'.v*');
 				sort($matches);
 				$parts=explode('.v',end($matches));
 				if((end($parts)+Storage::DEFAULTMININTERVAL)>time()){
@@ -114,12 +113,12 @@ class Storage {
 
 			// create all parent folders
 			$info=pathinfo($filename);	
-			if(!file_exists($versionsfoldername.'/'.$info['dirname'])) mkdir($versionsfoldername.'/'.$info['dirname'],0700,true);	
+			if(!file_exists($versionsFolderName.'/'.$info['dirname'])) mkdir($versionsFolderName.'/'.$info['dirname'],0700,true);	
 
 			// store a new version of a file
-			copy($filesfoldername.'/'.$filename,$versionsfoldername.'/'.$filename.'.v'.time());
+			copy($filesfoldername.'/'.$filename,$versionsFolderName.'/'.$filename.'.v'.time());
         
-			// expire old revisions
+			// expire old revisions if necessary
 			Storage::expire($filename);
 		}
 	}
@@ -138,12 +137,12 @@ class Storage {
 			} else {
 				$uid = \OCP\User::getUser();
 			}
-			$versionsfoldername=\OCP\Config::getSystemValue('datadirectory').'/'.$uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'.$uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 			
 			$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';
 			
 			// rollback
-			if ( @copy($versionsfoldername.'/'.$filename.'.v'.$revision,$filesfoldername.'/'.$filename) ) {
+			if ( @copy($versionsFolderName.'/'.$filename.'.v'.$revision,$filesfoldername.'/'.$filename) ) {
 			
 				return true;
 				
@@ -169,10 +168,10 @@ class Storage {
 			} else {
 				$uid = \OCP\User::getUser();
 			}
-			$versionsfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 
 			// check for old versions
-			$matches=glob($versionsfoldername.'/'.$filename.'.v*');
+			$matches=glob($versionsFolderName.'/'.$filename.'.v*');
 			if(count($matches)>1){
 				return true;
 			}else{
@@ -186,10 +185,15 @@ class Storage {
 
         
         /**
-         * get a list of old versions of a file.
+         * @brief get a list of all available versions of a file in descending chronological order
+         * @param $filename file to find versions of, relative to the user files dir
+         * @param $count number of versions to return
+         * @returns array
          */
-        public static function getversions($filename,$count=0) {
-                if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+        public static function getVersions( $filename, $count = 0 ) {
+        
+                if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
+                
 			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
 				$pos = strpos($source, '/files', 1);
 				$uid = substr($source, 1, $pos - 1);
@@ -197,29 +201,65 @@ class Storage {
 			} else {
 				$uid = \OCP\User::getUser();
 			}
-			$versionsfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-			$versions=array();         
- 
-	              // fetch for old versions
-			$matches=glob($versionsfoldername.'/'.$filename.'.v*');
-			sort($matches);
-			foreach($matches as $ma) {
-				$parts=explode('.v',$ma);
-				$versions[]=(end($parts));
+			$versionsFolderName = \OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+			$versions = array();         
+			
+			// fetch for old versions
+			$matches = glob( $versionsFolderName.'/'.$filename.'.v*' );
+			
+			sort( $matches );
+			
+			$i = 0;
+			
+			foreach( $matches as $ma ) {
+				
+				$i++;
+				$versions[$i]['cur'] = 0;
+				$parts = explode( '.v', $ma );
+				$versions[$i]['version'] = ( end( $parts ) );
+				
+				// if file with modified date exists, flag it in array as currently enabled version
+				$curFile['fileName'] = basename( $parts[0] );
+				$curFile['filePath'] = \OCP\Config::getSystemValue('datadirectory').\OC_Filesystem::getRoot().'/'.$curFile['fileName'];
+				
+				( \md5_file( $ma ) == \md5_file( $curFile['filePath'] ) ? $versions[$i]['fileMatch'] = 1 : $versions[$i]['fileMatch'] = 0 );
+				
 			}
 			
+			$versions = array_reverse( $versions );
+			
+			foreach( $versions as $key => $value ) {
+				
+				// flag the first matched file in array (which will have latest modification date) as current version
+				if ( $versions[$key]['fileMatch'] ) {
+				
+					$versions[$key]['cur'] = 1;
+					break;
+					
+				}
+			
+			}
+			
+			$versions = array_reverse( $versions );
+			
 			// only show the newest commits
-			if($count<>0 and (count($versions)>$count)) {
-				$versions=array_slice($versions,count($versions)-$count);
+			if( $count != 0 and ( count( $versions )>$count ) ) {
+			
+				$versions = array_slice( $versions, count( $versions ) - $count );
+				
 			}
 	
-			return($versions);
+			return( $versions );
 
 
-                }else{
-                        return(array());
+                } else {
+                
+			// if versioning isn't enabled then return an empty array
+                        return( array() );
+                        
                 }
-        }	
+                
+        }
 
 
         
@@ -228,6 +268,7 @@ class Storage {
          */
         public static function expire($filename) {
                 if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+
 			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
 				$pos = strpos($source, '/files', 1);
 				$uid = substr($source, 1, $pos - 1);
@@ -235,28 +276,93 @@ class Storage {
 			} else {
 				$uid = \OCP\User::getUser();
 			}
-			$versionsfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 
 			// check for old versions
-			$matches=glob($versionsfoldername.'/'.$filename.'.v*');
-			if(count($matches)>\OCP\Config::getSystemValue('files_versionmaxversions', Storage::DEFAULTMAXVERSIONS)){
-				$numbertodelete=count($matches-\OCP\Config::getSystemValue('files_versionmaxversions', Storage::DEFAULTMAXVERSIONS));
+			$matches = glob( $versionsFolderName.'/'.$filename.'.v*' );
+			
+			if( count( $matches ) > \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) ) {
+			
+				$numberToDelete = count( $matches-\OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) );
 
 				// delete old versions of a file
-				$deleteitems=array_slice($matches,0,$numbertodelete);
-				foreach($deleteitems as $de){
-					unlink($versionsfoldername.'/'.$filename.'.v'.$de);
+				$deleteItems = array_slice( $matches, 0, $numberToDelete );
+				
+				foreach( $deleteItems as $de ) {
+				
+					unlink( $versionsFolderName.'/'.$filename.'.v'.$de );
+					
 				}
 			}
                 }
         }
 
         /**
-         * expire all old versions.
+         * @brief erase all old versions of all user files
+         * @return 
          */
-        public static function expireall($filename) {
-		// todo this should go through all the versions directories and delete all the not needed files and not needed directories.
-		// useful to be included in a cleanup cronjob.
+        public static function expireAll() {
+	
+		function deleteAll($directory, $empty = false) {
+		
+			if(substr($directory,-1) == "/") {
+				$directory = substr($directory,0,-1);
+			}
+
+			if(!file_exists($directory) || !is_dir($directory)) {
+			
+				return false;
+				
+			} elseif(!is_readable($directory)) {
+			
+				return false;
+				
+			} else {
+			
+				$directoryHandle = opendir($directory);
+			
+				while ($contents = readdir($directoryHandle)) {
+				
+					if( $contents != '.' && $contents != '..') {
+						
+						$path = $directory . "/" . $contents;
+					
+						if( is_dir($path) ) {
+							
+							deleteAll($path);
+						
+						} else {
+						
+							unlink($path);
+						
+						}
+					}
+				
+				}
+			
+				closedir( $directoryHandle );
+
+				if( $empty == false ) {
+				
+					if(!rmdir($directory)) {
+					
+						return false;
+						
+					}
+					
+				}
+			
+				return true;
+			}
+			
+		}
+	
+		/*	
+		// FIXME: make this path dynamic
+		$dir = '/home/samtuke/owncloud/git/oc5/data/admin/versions';
+
+		( deleteAll( $dir, 1 ) ? return true : return false );
+		*/
         }
 
 
diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index 0cd825f3e5..b49e52f0bd 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -42,7 +42,8 @@ function handleRemove($name) {
 
 function handleGetThumbnails($albumname) {
   OCP\Response::enableCaching(3600 * 24); // 24 hour
-  $thumbnail = OC::$CONFIG_DATADIRECTORY.'/../gallery/'.urldecode($albumname).'.png';
+  $view = OCP\App::getStorage('gallery');
+  $thumbnail = $view->fopen(urldecode($albumname).'.png', 'r');
   header('Content-Type: '.OC_Image::getMimeTypeForFile($thumbnail));
   OCP\Response::sendFile($thumbnail);
 }
diff --git a/apps/gallery/ajax/sharing.php b/apps/gallery/ajax/sharing.php
index 1223320120..304757b9e9 100644
--- a/apps/gallery/ajax/sharing.php
+++ b/apps/gallery/ajax/sharing.php
@@ -80,7 +80,8 @@ function handleGetThumbnail($token, $imgpath) {
 function handleGetAlbumThumbnail($token, $albumname)
 {
   $owner = OC_Gallery_Sharing::getTokenOwner($token);
-  $file = OCP\Config::getSystemValue("datadirectory").'/'. $owner .'/gallery/'.$albumname.'.png';
+  $view = OCP\App::getStorage('gallery');
+  $file = $view->fopen($albumname.'.png', 'r');
   $image = new OC_Image($file);
   if ($image->valid()) {
     $image->centerCrop();
@@ -93,7 +94,8 @@ function handleGetAlbumThumbnail($token, $albumname)
 
 function handleGetPhoto($token, $photo) {
   $owner = OC_Gallery_Sharing::getTokenOwner($token);
-  $file = OCP\Config::getSystemValue( "datadirectory", OC::$SERVERROOT."/data" ).'/'.$owner.'/files'.urldecode($photo);
+  $view = OCP\App::getStorage('files');
+  $file = $view->fopen(urldecode($photo), 'r');
   header('Content-Type: '.OC_Image::getMimeTypeForFile($file));
   OCP\Response::sendFile($file);
 }
diff --git a/apps/gallery/index.php b/apps/gallery/index.php
index e47fb3db5d..a9fe200c4e 100644
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
@@ -27,10 +27,6 @@ OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('gallery');
 OCP\App::setActiveNavigationEntry( 'gallery_index' );
 
-if (!file_exists(OCP\Config::getSystemValue("datadirectory").'/'. OCP\USER::getUser() .'/gallery')) {
-  mkdir(OCP\Config::getSystemValue("datadirectory").'/'. OCP\USER::getUser() .'/gallery');
-}
-
 if (!isset($_GET['view'])) {
   $result = OC_Gallery_Album::find(OCP\USER::getUser());
 
diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index d1809462f2..905034f6fd 100644
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -78,14 +78,14 @@ function albumClickHandler(r) {
 		for (var i in r.photos) {
 			Albums.photos.push(r.photos[i]);
 		}
-    Albums.shared = r.shared;
-    if (Albums.shared) {
-      Albums.recursive = r.recursive;
-      Albums.token = r.token;
-    } else {
-      Albums.recursive = false;
-      Albums.token = '';
-    }
+		Albums.shared = r.shared;
+		if (Albums.shared) {
+			Albums.recursive = r.recursive;
+			Albums.token = r.token;
+		} else {
+			Albums.recursive = false;
+			Albums.token = '';
+		}
 		$(document).ready(function(){
 			var targetDiv = $('#gallery_list');
 			targetDiv.html('');
diff --git a/apps/gallery/l10n/ca.php b/apps/gallery/l10n/ca.php
index cbb0d8b6c5..165414fba2 100644
--- a/apps/gallery/l10n/ca.php
+++ b/apps/gallery/l10n/ca.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Fotos",
+"Settings" => "Arranjament",
 "Rescan" => "Escaneja de nou",
 "Stop" => "Atura",
 "Share" => "Comparteix",
-"Settings" => "Arranjament",
 "Back" => "Enrera",
 "Remove confirmation" => "Elimina la confirmació",
 "Do you want to remove album" => "Voleu eliminar l'àlbum",
diff --git a/apps/gallery/l10n/cs_CZ.php b/apps/gallery/l10n/cs_CZ.php
index 4d6394cbb3..d008e9d28b 100644
--- a/apps/gallery/l10n/cs_CZ.php
+++ b/apps/gallery/l10n/cs_CZ.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Obrázky",
+"Settings" => "Nastavení",
 "Rescan" => "Znovu prohledat",
 "Stop" => "Zastavit",
 "Share" => "Sdílet",
-"Settings" => "Nastavení",
 "Back" => "Zpět",
 "Remove confirmation" => "Potvrzení odebrání",
 "Do you want to remove album" => "Chcete odstranit album?",
diff --git a/apps/gallery/l10n/da.php b/apps/gallery/l10n/da.php
index b13b16350e..172f3c95e8 100644
--- a/apps/gallery/l10n/da.php
+++ b/apps/gallery/l10n/da.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "Billeder",
+"Settings" => "Indstillinger",
 "Rescan" => "Genindlæs",
-"Back" => "Tilbage"
+"Stop" => "Stop",
+"Share" => "Del",
+"Back" => "Tilbage",
+"Remove confirmation" => "Fjern bekræftelse",
+"Do you want to remove album" => "Ønsker du at fjerne albummet",
+"Change album name" => "Ændre albummets navn",
+"New album name" => "Nyt album navn"
 );
diff --git a/apps/gallery/l10n/de.php b/apps/gallery/l10n/de.php
index f760022ba2..6c3d9fc738 100644
--- a/apps/gallery/l10n/de.php
+++ b/apps/gallery/l10n/de.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Bilder",
-"Rescan" => "Rescan",
+"Settings" => "Einstellungen",
+"Rescan" => "Erneut Scannen",
 "Stop" => "Stopp",
 "Share" => "Teilen",
-"Settings" => "Einstellungen",
 "Back" => "Zurück",
 "Remove confirmation" => "Bestätigung entfernen",
 "Do you want to remove album" => "Soll das Album entfernt werden",
diff --git a/apps/gallery/l10n/el.php b/apps/gallery/l10n/el.php
index 461bd34670..3983011a0c 100644
--- a/apps/gallery/l10n/el.php
+++ b/apps/gallery/l10n/el.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Εικόνες",
-"Rescan" => "Επανασάρωση",
-"Stop" => "Σταμάτησε",
-"Share" => "Κοινοποίησε",
 "Settings" => "Ρυθμίσεις",
+"Rescan" => "Επανασάρωση",
+"Stop" => "Διακοπή",
+"Share" => "Κοινοποίηση",
 "Back" => "Επιστροφή",
 "Remove confirmation" => "Αφαίρεση επιβεβαίωσης",
 "Do you want to remove album" => "Θέλετε να αφαιρέσετε το άλμπουμ",
diff --git a/apps/gallery/l10n/eo.php b/apps/gallery/l10n/eo.php
index 7958d04f1b..254010b788 100644
--- a/apps/gallery/l10n/eo.php
+++ b/apps/gallery/l10n/eo.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "Bildoj",
+"Settings" => "Agordo",
 "Rescan" => "Reskani",
-"Back" => "Antaŭen"
+"Stop" => "Halti",
+"Share" => "Kunhavigi",
+"Back" => "Antaŭen",
+"Remove confirmation" => "Forigi konfirmadon",
+"Do you want to remove album" => "Ĉu vi volas forigi la albumon?",
+"Change album name" => "Ŝanĝi albumnomon",
+"New album name" => "Nova albumnomo"
 );
diff --git a/apps/gallery/l10n/es.php b/apps/gallery/l10n/es.php
index 098a92b5c5..03e8d6a456 100644
--- a/apps/gallery/l10n/es.php
+++ b/apps/gallery/l10n/es.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Imágenes",
+"Settings" => "Preferencias",
 "Rescan" => "Refrescar",
 "Stop" => "Parar",
 "Share" => "Compartir",
-"Settings" => "Preferencias",
 "Back" => "Atrás",
 "Remove confirmation" => "Borrar confirmación",
 "Do you want to remove album" => "¿Quieres eliminar el álbum",
diff --git a/apps/gallery/l10n/et_EE.php b/apps/gallery/l10n/et_EE.php
index e386274bc5..06bd3a5b8f 100644
--- a/apps/gallery/l10n/et_EE.php
+++ b/apps/gallery/l10n/et_EE.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Pildid",
+"Settings" => "Seaded",
 "Rescan" => "Skänni uuesti",
 "Stop" => "Peata",
 "Share" => "Jaga",
-"Settings" => "Seaded",
 "Back" => "Tagasi",
 "Remove confirmation" => "Eemaldamise kinnitus",
 "Do you want to remove album" => "Kas sa soovid albumit eemaldada",
diff --git a/apps/gallery/l10n/eu.php b/apps/gallery/l10n/eu.php
index 9942183523..f406730a8e 100644
--- a/apps/gallery/l10n/eu.php
+++ b/apps/gallery/l10n/eu.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Argazkiak",
+"Settings" => "Ezarpenak",
 "Rescan" => "Bireskaneatu",
 "Stop" => "Gelditu",
 "Share" => "Elkarbanatu",
-"Settings" => "Ezarpenak",
 "Back" => "Atzera",
 "Remove confirmation" => "Ezabatu konfirmazioa",
 "Do you want to remove album" => "Albuma ezabatu nahi al duzu",
diff --git a/apps/gallery/l10n/fa.php b/apps/gallery/l10n/fa.php
index 4ddf28b015..97d47047eb 100644
--- a/apps/gallery/l10n/fa.php
+++ b/apps/gallery/l10n/fa.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "تصاویر",
+"Settings" => "تنظیمات",
 "Rescan" => "بازرسی دوباره",
 "Stop" => "توقف",
 "Share" => "به اشتراک گذاری",
-"Settings" => "تنظیمات",
 "Back" => "بازگشت",
 "Remove confirmation" => "پاک کردن تصدیق",
 "Do you want to remove album" => "آیا مایل به پاک کردن آلبوم هستید؟",
diff --git a/apps/gallery/l10n/fi_FI.php b/apps/gallery/l10n/fi_FI.php
new file mode 100644
index 0000000000..267bb5e547
--- /dev/null
+++ b/apps/gallery/l10n/fi_FI.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Pictures" => "Kuvat",
+"Settings" => "Asetukset",
+"Rescan" => "Etsi uusia",
+"Stop" => "Pysäytä",
+"Share" => "Jaa",
+"Back" => "Takaisin",
+"Remove confirmation" => "Poiston vahvistus",
+"Do you want to remove album" => "Tahdotko poistaa albumin",
+"Change album name" => "Muuta albumin nimeä",
+"New album name" => "Uuden albumin nimi"
+);
diff --git a/apps/gallery/l10n/fr.php b/apps/gallery/l10n/fr.php
index 4cbd42f1b3..dfd668ebe8 100644
--- a/apps/gallery/l10n/fr.php
+++ b/apps/gallery/l10n/fr.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Images",
+"Settings" => "Préférences",
 "Rescan" => "Analyser à nouveau",
 "Stop" => "Arrêter",
 "Share" => "Partager",
-"Settings" => "Préférences",
 "Back" => "Retour",
 "Remove confirmation" => "Enlever la confirmation",
 "Do you want to remove album" => "Voulez-vous supprimer l'album",
diff --git a/apps/gallery/l10n/gl.php b/apps/gallery/l10n/gl.php
index b06a159822..b7993ff5c8 100644
--- a/apps/gallery/l10n/gl.php
+++ b/apps/gallery/l10n/gl.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "Fotografías",
+"Settings" => "Configuración",
 "Rescan" => "Analizar de novo",
-"Back" => "Atrás"
+"Stop" => "Parar",
+"Share" => "Compartir",
+"Back" => "Atrás",
+"Remove confirmation" => "Eliminar confirmación",
+"Do you want to remove album" => "Quere eliminar o album",
+"Change album name" => "Trocar o nome do album",
+"New album name" => "Novo nome do album"
 );
diff --git a/apps/gallery/l10n/hr.php b/apps/gallery/l10n/hr.php
new file mode 100644
index 0000000000..edc11ebd9d
--- /dev/null
+++ b/apps/gallery/l10n/hr.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Pictures" => "Slike",
+"Settings" => "Postavke",
+"Rescan" => "Ponovo očitaj",
+"Stop" => "Zaustavi",
+"Share" => "Podijeli",
+"Back" => "Natrag",
+"Remove confirmation" => "Ukloni potvrdu",
+"Do you want to remove album" => "Želite li ukloniti album",
+"Change album name" => "Promijeni ime albuma",
+"New album name" => "Novo ime albuma"
+);
diff --git a/apps/gallery/l10n/hu_HU.php b/apps/gallery/l10n/hu_HU.php
index bd30fe20f2..34adf7719c 100644
--- a/apps/gallery/l10n/hu_HU.php
+++ b/apps/gallery/l10n/hu_HU.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Képek",
+"Settings" => "Beállítások",
 "Rescan" => "Újravizsgálás",
 "Stop" => "Állj",
 "Share" => "Megosztás",
-"Settings" => "Beállítások",
 "Back" => "Vissza",
 "Remove confirmation" => "Megerősítés eltávolítása",
 "Do you want to remove album" => "El akarja távolítani az albumot?",
diff --git a/apps/gallery/l10n/id.php b/apps/gallery/l10n/id.php
new file mode 100644
index 0000000000..7a977b3c9a
--- /dev/null
+++ b/apps/gallery/l10n/id.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Pictures" => "Gambar",
+"Settings" => "Setting",
+"Rescan" => "Scan ulang",
+"Stop" => "Berhenti",
+"Share" => "Bagikan",
+"Back" => "Kembali",
+"Remove confirmation" => "Hapus konfirmasi",
+"Do you want to remove album" => "Apakah anda ingin menghapus album",
+"Change album name" => "Ubah nama album",
+"New album name" => "Nama album baru"
+);
diff --git a/apps/gallery/l10n/it.php b/apps/gallery/l10n/it.php
index 1ca8712926..e21a1d6524 100644
--- a/apps/gallery/l10n/it.php
+++ b/apps/gallery/l10n/it.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Immagini",
+"Settings" => "Impostazioni",
 "Rescan" => "Nuova scansione",
 "Stop" => "Ferma",
 "Share" => "Condividi",
-"Settings" => "Impostazioni",
 "Back" => "Indietro",
 "Remove confirmation" => "Rimuovi conferma",
 "Do you want to remove album" => "Vuoi rimuovere l'album",
diff --git a/apps/gallery/l10n/ja_JP.php b/apps/gallery/l10n/ja_JP.php
index 70d4efa53a..4ef4510bab 100644
--- a/apps/gallery/l10n/ja_JP.php
+++ b/apps/gallery/l10n/ja_JP.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "写真",
+"Settings" => "設定",
 "Rescan" => "再スキャン",
-"Back" => "戻る"
+"Stop" => "停止",
+"Share" => "共有",
+"Back" => "戻る",
+"Remove confirmation" => "承認を取りやめ",
+"Do you want to remove album" => "アルバムを削除しますか？",
+"Change album name" => "アルバム名を変更する",
+"New album name" => "新しいアルバム名"
 );
diff --git a/apps/gallery/l10n/ko.php b/apps/gallery/l10n/ko.php
index b6d37796a0..1900049f87 100644
--- a/apps/gallery/l10n/ko.php
+++ b/apps/gallery/l10n/ko.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "사진",
+"Settings" => "세팅",
 "Rescan" => "재검색",
 "Stop" => "정지",
 "Share" => "공유",
-"Settings" => "세팅",
 "Back" => "뒤로",
 "Remove confirmation" => "삭제 승인",
 "Do you want to remove album" => "앨범을 삭제하시겠습니까",
diff --git a/apps/gallery/l10n/lb.php b/apps/gallery/l10n/lb.php
new file mode 100644
index 0000000000..136acedc65
--- /dev/null
+++ b/apps/gallery/l10n/lb.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Pictures" => "Fotoen",
+"Settings" => "Astellungen",
+"Rescan" => "Nei scannen",
+"Stop" => "Stop",
+"Share" => "Deelen",
+"Back" => "Zeréck",
+"Remove confirmation" => "Konfirmatioun läschen",
+"Do you want to remove album" => "Wëlls de den Album läschen",
+"Change album name" => "Album Numm änneren",
+"New album name" => "Neien Numm fir den Album"
+);
diff --git a/apps/gallery/l10n/lt_LT.php b/apps/gallery/l10n/lt_LT.php
index 1d8e064982..89c1a92d0c 100644
--- a/apps/gallery/l10n/lt_LT.php
+++ b/apps/gallery/l10n/lt_LT.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "Nuotraukos",
+"Settings" => "Nustatymai",
 "Rescan" => "Atnaujinti",
-"Back" => "Atgal"
+"Stop" => "Sustabdyti",
+"Share" => "Dalintis",
+"Back" => "Atgal",
+"Remove confirmation" => "Išjungti patvirtinimą",
+"Do you want to remove album" => "Ar tikrai norite pašalinti albumą",
+"Change album name" => "Keisti albumo pavadinimą",
+"New album name" => "Naujo albumo pavadinimas"
 );
diff --git a/apps/gallery/l10n/mk.php b/apps/gallery/l10n/mk.php
index 59bef78bec..97f85de7ab 100644
--- a/apps/gallery/l10n/mk.php
+++ b/apps/gallery/l10n/mk.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Слики",
+"Settings" => "Параметри",
 "Rescan" => "Рескенирај",
 "Stop" => "Стоп",
 "Share" => "Сподели",
-"Settings" => "Параметри",
 "Back" => "Назад",
 "Remove confirmation" => "Тргни потврда",
 "Do you want to remove album" => "Дали сакате да го отстраните албумот",
diff --git a/apps/gallery/l10n/nb_NO.php b/apps/gallery/l10n/nb_NO.php
index e3f35ea393..93dcb8372d 100644
--- a/apps/gallery/l10n/nb_NO.php
+++ b/apps/gallery/l10n/nb_NO.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Bilder",
+"Settings" => "Innstillinger",
 "Rescan" => "Les inn på nytt",
 "Stop" => "Stopp",
 "Share" => "Del",
-"Settings" => "Innstillinger",
 "Back" => "Tilbake",
 "Remove confirmation" => "Fjern bekreftelse",
 "Do you want to remove album" => "Ønsker du å slette albumet?",
diff --git a/apps/gallery/l10n/nl.php b/apps/gallery/l10n/nl.php
index b4bd0eb8ea..8c987a03d6 100644
--- a/apps/gallery/l10n/nl.php
+++ b/apps/gallery/l10n/nl.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Plaatjes",
+"Settings" => "Instellingen",
 "Rescan" => "Opnieuw doorzoeken",
 "Stop" => "Stop",
 "Share" => "Deel",
-"Settings" => "Instellingen",
 "Back" => "Terug",
 "Remove confirmation" => "Verwijder bevestiging",
 "Do you want to remove album" => "Wil je het album verwijderen: ",
diff --git a/apps/gallery/l10n/pl.php b/apps/gallery/l10n/pl.php
index 36004daa25..1ff636ac2a 100644
--- a/apps/gallery/l10n/pl.php
+++ b/apps/gallery/l10n/pl.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "Zdjęcia",
+"Settings" => "Ustawienia",
 "Rescan" => "Przeszukaj",
-"Back" => "Wróć"
+"Stop" => "Stop",
+"Share" => "Współdziel",
+"Back" => "Wróć",
+"Remove confirmation" => "Usuń potwierdzenie",
+"Do you want to remove album" => "Czy chcesz usunąć album",
+"Change album name" => "Zmień nazwę albumu",
+"New album name" => "Nowa nazwa albumu"
 );
diff --git a/apps/gallery/l10n/pt_BR.php b/apps/gallery/l10n/pt_BR.php
index 6fb47e4f84..7b45df444e 100644
--- a/apps/gallery/l10n/pt_BR.php
+++ b/apps/gallery/l10n/pt_BR.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Fotos",
+"Settings" => "Configuração",
 "Rescan" => "Atualizar",
 "Stop" => "Parar",
 "Share" => "Compartilhar",
-"Settings" => "Configuração",
 "Back" => "Voltar",
 "Remove confirmation" => "Confirmar apagar",
 "Do you want to remove album" => "Voçe dezeja remover o album",
diff --git a/apps/gallery/l10n/pt_PT.php b/apps/gallery/l10n/pt_PT.php
index 5d704b824c..54e99cf245 100644
--- a/apps/gallery/l10n/pt_PT.php
+++ b/apps/gallery/l10n/pt_PT.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "Imagens",
+"Settings" => "Definições",
 "Rescan" => "Atualizar",
-"Back" => "Voltar"
+"Stop" => "Parar",
+"Share" => "Partilhar",
+"Back" => "Voltar",
+"Remove confirmation" => "Remove confirmação",
+"Do you want to remove album" => "Deseja remover o album",
+"Change album name" => "Mudar o nome do album",
+"New album name" => "Novo nome do album"
 );
diff --git a/apps/gallery/l10n/ro.php b/apps/gallery/l10n/ro.php
index 624e73659b..3537c68b17 100644
--- a/apps/gallery/l10n/ro.php
+++ b/apps/gallery/l10n/ro.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "Imagini",
+"Settings" => "Setări",
 "Rescan" => "Re-scanează",
-"Back" => "Înapoi"
+"Stop" => "Stop",
+"Share" => "Partajează",
+"Back" => "Înapoi",
+"Remove confirmation" => "Șterge confirmarea",
+"Do you want to remove album" => "Vrei să ștergi albumul",
+"Change album name" => "Schimbă numele albumului",
+"New album name" => "Nume nou album"
 );
diff --git a/apps/gallery/l10n/ru.php b/apps/gallery/l10n/ru.php
index 177d5fd3f3..f1c530ed28 100644
--- a/apps/gallery/l10n/ru.php
+++ b/apps/gallery/l10n/ru.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "Рисунки",
+"Settings" => "Настройки",
 "Rescan" => "Обновить",
-"Back" => "Назад"
+"Stop" => "Остановить",
+"Share" => "Поделиться",
+"Back" => "Назад",
+"Remove confirmation" => "Подтверждение удаления",
+"Do you want to remove album" => "Вы хотите удалить альбом?",
+"Change album name" => "Изменить имя альбома",
+"New album name" => "Новое имя альбома"
 );
diff --git a/apps/gallery/l10n/sk_SK.php b/apps/gallery/l10n/sk_SK.php
index 9c18cb49cd..e3e3be7881 100644
--- a/apps/gallery/l10n/sk_SK.php
+++ b/apps/gallery/l10n/sk_SK.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Obrázky",
+"Settings" => "nastavenia",
 "Rescan" => "Znovu oskenovať",
 "Stop" => "Zastaviť",
 "Share" => "Zdielať",
-"Settings" => "nastavenia",
 "Back" => "Späť",
 "Remove confirmation" => "Potvrdenie odstránenia",
 "Do you want to remove album" => "Chcete odstrániť album?",
diff --git a/apps/gallery/l10n/sl.php b/apps/gallery/l10n/sl.php
index 671e730636..5e06123986 100644
--- a/apps/gallery/l10n/sl.php
+++ b/apps/gallery/l10n/sl.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Slike",
+"Settings" => "Nastavitve",
 "Rescan" => "Ponovno preišči",
 "Stop" => "Stop",
 "Share" => "Deli",
-"Settings" => "Nastavitve",
 "Back" => "Nazaj",
 "Remove confirmation" => "Odstrani potrditev",
 "Do you want to remove album" => "Ali želite odstraniti album",
diff --git a/apps/gallery/l10n/sv.php b/apps/gallery/l10n/sv.php
index c1568e348d..520d271df1 100644
--- a/apps/gallery/l10n/sv.php
+++ b/apps/gallery/l10n/sv.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Pictures" => "Bilder",
+"Settings" => "Inställningar",
 "Rescan" => "Sök igen",
-"Back" => "Tillbaka"
+"Stop" => "Stoppa",
+"Share" => "Dela",
+"Back" => "Tillbaka",
+"Remove confirmation" => "Vill du säkert ta bort",
+"Do you want to remove album" => "Vill du ta bort albumet",
+"Change album name" => "Ändra albumnamnet",
+"New album name" => "Albumnamn"
 );
diff --git a/apps/gallery/l10n/th_TH.php b/apps/gallery/l10n/th_TH.php
index 39d43dcdc4..34da8dc57f 100644
--- a/apps/gallery/l10n/th_TH.php
+++ b/apps/gallery/l10n/th_TH.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "รูปภาพ",
+"Settings" => "ตั้งค่า",
 "Rescan" => "ตรวจสอบอีกครั้ง",
 "Stop" => "หยุด",
 "Share" => "แชร์",
-"Settings" => "ตั้งค่า",
 "Back" => "ย้อนกลับ",
 "Remove confirmation" => "การยืนยันการลบ",
 "Do you want to remove album" => "คุณต้องการลบอัลบั้มออกหรือไม่",
diff --git a/apps/gallery/l10n/tr.php b/apps/gallery/l10n/tr.php
index 07d853998b..c42592448c 100644
--- a/apps/gallery/l10n/tr.php
+++ b/apps/gallery/l10n/tr.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Resimler",
+"Settings" => "Ayarlar",
 "Rescan" => "Yeniden Tara ",
 "Stop" => "Durdur",
 "Share" => "Paylaş",
-"Settings" => "Ayarlar",
 "Back" => "Geri",
 "Remove confirmation" => "Doğrulamayı kaldır",
 "Do you want to remove album" => "Albümü silmek istiyor musunuz",
diff --git a/apps/gallery/l10n/zh_CN.php b/apps/gallery/l10n/zh_CN.php
index 006c64c32b..ffa321f7de 100644
--- a/apps/gallery/l10n/zh_CN.php
+++ b/apps/gallery/l10n/zh_CN.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "图片",
+"Settings" => "设置",
 "Rescan" => "重新扫描",
 "Stop" => "停止",
 "Share" => "分享",
-"Settings" => "设置",
 "Back" => "返回",
 "Remove confirmation" => "移除确认",
 "Do you want to remove album" => "您是否想要移除相册",
diff --git a/apps/gallery/l10n/zh_TW.php b/apps/gallery/l10n/zh_TW.php
index 3e633bd792..eb4577affc 100644
--- a/apps/gallery/l10n/zh_TW.php
+++ b/apps/gallery/l10n/zh_TW.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "圖片",
+"Settings" => "設定",
 "Rescan" => "重新掃描",
 "Stop" => "停止",
 "Share" => "分享",
-"Settings" => "設定",
 "Back" => "返回",
 "Remove confirmation" => "移除確認",
 "Do you want to remove album" => "你確定要移除相簿嗎",
diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index 5f962f12f1..8ac27b1a70 100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -77,7 +77,7 @@ class OC_Gallery_Album {
 			$sql .= ' AND parent_path = ?';
 			$args[] = $parent;
 		}
-    $order = OCP\Config::getUserValue($owner, 'gallery', 'order', 'ASC');
+		$order = OCP\Config::getUserValue($owner, 'gallery', 'order', 'ASC');
 		$sql .= ' ORDER BY album_name ' . $order;
 
 		$stmt = OCP\DB::prepare($sql);
@@ -90,25 +90,22 @@ class OC_Gallery_Album {
 	}
 
 	public static function changeThumbnailPath($oldname, $newname) {
-		 
-		$thumbpath = OC::$CONFIG_DATADIRECTORY.'/../gallery/';
-		rename($thumbpath.$oldname.'.png', $thumbpath.$newname.'.png');
+		$view = OCP\App::getStorage('gallery');
+		$view->rename($oldname.'.png', $newname.'.png');
 	}
 
 	public static function getAlbumSize($id){
-    $sql = 'SELECT COUNT(*) as size FROM *PREFIX*gallery_photos WHERE album_id = ?';
-    $stmt = OCP\DB::prepare($sql);
-    $result=$stmt->execute(array($id))->fetchRow();
-    return $result['size'];
+		$sql = 'SELECT COUNT(*) as size FROM *PREFIX*gallery_photos WHERE album_id = ?';
+		$stmt = OCP\DB::prepare($sql);
+		$result=$stmt->execute(array($id))->fetchRow();
+		return $result['size'];
 	}
 
-  public static function getIntermediateGallerySize($path) {
-    $path .= '%';
-    $sql = 'SELECT COUNT(*) as size FROM *PREFIX*gallery_photos photos, *PREFIX*gallery_albums albums WHERE photos.album_id = albums.album_id AND uid_owner = ? AND file_path LIKE ?';
-    $stmt = OCP\DB::prepare($sql);
-    $result = $stmt->execute(array(OCP\USER::getUser(), $path))->fetchRow();
-    return $result['size'];
-  }
+	public static function getIntermediateGallerySize($path) {
+		$path .= '%';
+		$sql = 'SELECT COUNT(*) as size FROM *PREFIX*gallery_photos photos, *PREFIX*gallery_albums albums WHERE photos.album_id = albums.album_id AND uid_owner = ? AND file_path LIKE ?';
+		$stmt = OCP\DB::prepare($sql);
+		$result = $stmt->execute(array(OCP\USER::getUser(), $path))->fetchRow();
+		return $result['size'];
+	}
 }
-
-?>
diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
index 99384af621..b4b37236b0 100644
--- a/apps/gallery/lib/photo.php
+++ b/apps/gallery/lib/photo.php
@@ -68,17 +68,17 @@ class OC_Gallery_Photo {
 
 	public static function getThumbnail($image_name, $owner = null) {
 		if (!$owner) $owner = OCP\USER::getUser();
-		$save_dir = OCP\Config::getSystemValue("datadirectory").'/'. $owner .'/gallery/';
-		$save_dir .= dirname($image_name). '/';
-		$image_path = $image_name;
-		$thumb_file = $save_dir . basename($image_name);
-		if (!is_dir($save_dir)) {
-			mkdir($save_dir, 0777, true);
+		$view = OCP\App::getStorage('gallery');
+		$save_dir = dirname($image_name);
+		if (!$view->is_dir($save_dir)) {
+			$view->mkdir($save_dir);
 		}
-		if (file_exists($thumb_file)) {
-			$image = new OC_Image($thumb_file);
+		$view->chroot($view->getRoot().'/'.$save_dir);
+		$thumb_file = basename($image_name);
+		if ($view->file_exists($thumb_file)) {
+			$image = new OC_Image($view->fopen($thumb_file, 'r'));
 		} else {
-			$image_path = OC_Filesystem::getLocalFile($image_path);
+			$image_path = OC_Filesystem::getLocalFile($image_name);
 			if(!file_exists($image_path)) {
 				return null;
 			}
@@ -86,7 +86,7 @@ class OC_Gallery_Photo {
 			if ($image->valid()) {
 				$image->centerCrop(200);
 				$image->fixOrientation();
-				$image->save($thumb_file);
+				$image->save($view->getLocalFile($thumb_file));
 			}
 		}
 		if ($image->valid()) {
diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index 7a137cb3f5..e11ba1da45 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -81,7 +81,8 @@ class OC_Gallery_Scanner {
 				$image->destroy();
 			}
 		}
-		imagepng($thumbnail, OCP\Config::getSystemValue("datadirectory").'/'. OCP\USER::getUser() .'/gallery/' . $albumName.'.png');
+		$view = OCP\App::getStorage('gallery');
+		imagepng($thumbnail, $view->getLocalFile($albumName.'.png'));
 		imagedestroy($thumbnail);
 	}
 
diff --git a/apps/media/l10n/fi_FI.php b/apps/media/l10n/fi_FI.php
new file mode 100644
index 0000000000..2426f6a220
--- /dev/null
+++ b/apps/media/l10n/fi_FI.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Musiikki",
+"Play" => "Toista",
+"Pause" => "Tauko",
+"Previous" => "Edellinen",
+"Next" => "Seuraava",
+"Mute" => "Mykistä",
+"Unmute" => "Palauta äänet",
+"Rescan Collection" => "Etsi uusia kappaleita",
+"Artist" => "Esittäjä",
+"Album" => "Albumi",
+"Title" => "Nimi"
+);
diff --git a/apps/media/l10n/ja_JP.php b/apps/media/l10n/ja_JP.php
index 395ebe792e..7faa098250 100644
--- a/apps/media/l10n/ja_JP.php
+++ b/apps/media/l10n/ja_JP.php
@@ -6,7 +6,7 @@
 "Next" => "次",
 "Mute" => "ミュート",
 "Unmute" => "ミュート解除",
-"Rescan Collection" => "コレクションを再読み込みする",
+"Rescan Collection" => "コレクションの再スキャン",
 "Artist" => "アーティスト",
 "Album" => "アルバム",
 "Title" => "曲名"
diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php
index dc2a8a9beb..82170e5ca8 100644
--- a/apps/media/lib_scanner.php
+++ b/apps/media/lib_scanner.php
@@ -79,19 +79,19 @@ class OC_MEDIA_SCANNER{
 			OCP\Util::writeLog('media',"error reading artist tag in '$file'",OCP\Util::WARN);
 			$artist='unknown';
 		}else{
-			$artist=stripslashes($data['comments']['artist'][0]);
+			$artist=strip_tags(stripslashes($data['comments']['artist'][0]));
 		}
 		if(!isset($data['comments']['album'])){
 			OCP\Util::writeLog('media',"error reading album tag in '$file'",OCP\Util::WARN);
 			$album='unknown';
 		}else{
-			$album=stripslashes($data['comments']['album'][0]);
+			$album=strip_tags(stripslashes($data['comments']['album'][0]));
 		}
 		if(!isset($data['comments']['title'])){
 			OCP\Util::writeLog('media',"error reading title tag in '$file'",OCP\Util::WARN);
 			$title='unknown';
 		}else{
-			$title=stripslashes($data['comments']['title'][0]);
+			$title=strip_tags(stripslashes($data['comments']['title'][0]));
 		}
 		$size=$data['filesize'];
 		if (isset($data['comments']['track']))
diff --git a/apps/tasks/css/style.css b/apps/tasks/css/style.css
index 3cf175e646..23aac4e9ca 100644
--- a/apps/tasks/css/style.css
+++ b/apps/tasks/css/style.css
@@ -9,7 +9,7 @@
 #tasks_lists .active{font-weight:bold;}
 #tasks_list h1{background-color:#1D2D44;color:white;font-size:120%;padding:0 0.5em;}
 
-.task{border-radius:0.4em;position:relative;padding:0.5em 1em;}
+.task{border-radius:0.4em;position:relative;padding:0.4em 1em;}
 .task:nth-child(odd){background-color:#F4F4F4;}
 .task:hover {background-color:#DDDDDD;}
 
@@ -33,7 +33,7 @@
 .task .completed {position:absolute;left:3em;top:0.3em;}
 
 .task .summary{padding-left:4em;height:2em;}
-.task .summary input{position:relative;left:5px;}
+.task .summary input{position:relative;left:5px;top:0.5em;}
 .task.done .summary{text-decoration:line-through;}
 
 .task .tag{border-radius:0.4em;display:inline-block;opacity:0.2;margin:0 0.2em;border:1px solid transparent;padding:0 0.4em;cursor:pointer;}
@@ -42,18 +42,19 @@
 .task:hover .tag{opacity:0.5}
 .task:hover .tag:hover{opacity:0.8;}
 
-.task .categories{position:absolute;right:12em;text-align:right;top:0.4em}
+.task .categories{position:absolute;right:12em;text-align:right;top:0.5em}
 .task .categories a{background-color:#1d2d44;color:white;}
 .task .categories .tag.active{display:none;}
 .task input.categories{display:none;top:0;text-align:left;}
 
-.task .location{background-color:#442d44;color:white;position:absolute;right:0.6em;width:9.2em;text-align:left;top:0.4em}
+.task .location{background-color:#442d44;color:white;position:absolute;right:0.6em;width:9.2em;text-align:left;top:0.5em}
 .task input.location{display:none;top:0;text-align:left;right:0.3em;background-color:white;color:#333333;}
 
 .task .more{display:none;margin-top:0.5em;}
 .task_less{display:none;}
 
 .task .description{position:relative;left:4em;}
+.task textarea.description{width:35em;height:4em;}
 .task .due{position:absolute;right:0.3em;}
 .task .due .date{width:6em;}
 .task .due .time{width:6em;}
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 34c4f8f9d9..3462f2473f 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -26,7 +26,7 @@
 		<label for="ldap_quota_def">Quota Default</label><input type="text" id="ldap_quota_def" name="ldap_quota_def" value="<?php if (isset($_['ldap_quota_def'])) echo $_['ldap_quota_def']; ?>" />bytes</p>
 		<p><label for="ldap_email_attr">Email Attribute</label><input type="text" id="ldap_email_attr" name="ldap_email_attr" value="<?php echo $_['ldap_email_attr']; ?>" /></p>
 	</fieldset>
-	<input type="submit" value="Save" />
+	<input type="submit" value="Save" /> <a href="http://owncloud.org/support/ldap-backend/" target="_blank"><img src="<?php echo OCP\Util::imagePath('','actions/info.png'); ?>" style="height:1.75ex" /> <?php echo $l->t('Help');?></a>
 	</div>
 
 </form>
diff --git a/apps/user_openid/user_openid.php b/apps/user_openid/user_openid.php
index 3267db3fa0..e228de95e9 100644
--- a/apps/user_openid/user_openid.php
+++ b/apps/user_openid/user_openid.php
@@ -24,7 +24,7 @@
 require_once('class.openid.v3.php');
 
 /**
- * Class for user management in a SQL Database (e.g. MySQL, SQLite)
+ * Class for user OpenId backend
  */
 class OC_USER_OPENID extends OC_User_Backend {
 	/**
diff --git a/config/config.sample.php b/config/config.sample.php
index e86dc05cb0..7ab327e2bc 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -29,6 +29,11 @@ $CONFIG = array(
 "log_type" => "",
 "logfile" => "",
 "loglevel" => "",
+/* Set this to false to disable the check for writable apps dir.
+ * If the apps dir is not writable, you can't download&install extra apps
+ * in the admin apps menu.
+ */
+"writable_appsdir" => true,
 // "datadirectory" => ""
 );
 ?>
diff --git a/core/css/styles.css b/core/css/styles.css
index 186c11b4ff..b6b5918d65 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -134,7 +134,7 @@ div.jp-play-bar, div.jp-seek-bar { padding:0; }
 
 li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; color: #FF3B3B; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
 .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow: hidden; text-overflow: ellipsis; }
-.hint { background-image: url('/core/img/actions/info.png'); background-repeat:no-repeat; color: #777777; padding-left: 25px; background-position: 0 0.3em;}
+.hint { background-image: url('../img/actions/info.png'); background-repeat:no-repeat; color: #777777; padding-left: 25px; background-position: 0 0.3em;}
 .separator { display: inline; border-left: 1px solid #d3d3d3; border-right: 1px solid #fff; height: 10px; width:0px; margin: 4px; }
 
 a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padding-top: 0px;padding-bottom: 2px; text-decoration: none; margin-top: 5px }
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 97ebb27bac..f7b5b48f6f 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Applikationens navn ikke medsendt",
+"No category to add?" => "Ingen kategori at tilføje?",
+"This category already exists: " => "Denne kategori eksisterer allerede: ",
 "Owncloud password reset" => "Nulstil adgangskode til Owncloud",
+"ownCloud password reset" => "Nulstil ownCloud kodeord",
 "Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}",
 "You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.",
 "Requested" => "Forespugt",
@@ -15,7 +19,10 @@
 "Apps" => "Apps",
 "Admin" => "Admin",
 "Help" => "Hjælp",
+"Access forbidden" => "Adgang forbudt",
 "Cloud not found" => "Sky ikke fundet",
+"Edit categories" => "Rediger kategorier",
+"Add" => "Tilføj",
 "Create an <strong>admin account</strong>" => "Opret en <strong>administratorkonto</strong>",
 "Password" => "Kodeord",
 "Advanced" => "Avanceret",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index f29382f8ef..9fcd5c8496 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Application name not provided." => "Applikationsname nicht angegeben",
-"No category to add?" => "Keine Kategorie hinzufügen?",
+"No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: " => "Kategorie existiert bereits:",
-"Owncloud password reset" => "OwnCloud Passwort zurücksetzen",
+"Owncloud password reset" => "ownCloud Passwort zurücksetzen",
 "ownCloud password reset" => "ownCloud Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutze folgenden Link, um dein Passwort zurückzusetzen: {link}",
 "You will receive a link to reset your password via Email." => "Sie erhalten einen Link, um Ihr Passwort per E-Mail zurückzusetzen.",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 5d2e3310c3..6dc65ed495 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -1,6 +1,46 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Sovelluksen nimeä ei määritelty.",
+"No category to add?" => "Ei lisättävää luokkaa?",
+"This category already exists: " => "Tämä luokka on jo olemassa: ",
+"Owncloud password reset" => "Owncloud-salasanan nollaus",
+"ownCloud password reset" => "ownCloud-salasanan nollaus",
+"Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
+"You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.",
+"Requested" => "Tilattu",
+"Login failed!" => "Kirjautuminen epäonnistui!",
 "Username" => "Käyttäjätunnus",
+"Request reset" => "Tilaus lähetetty",
+"Your password was reset" => "Salasanasi nollattiin",
+"To login page" => "Kirjautumissivulle",
+"New password" => "Uusi salasana",
+"Reset password" => "Palauta salasana",
+"Personal" => "Henkilökohtaiset",
+"Users" => "Käyttäjät",
+"Apps" => "Sovellukset",
+"Admin" => "Hallinta",
+"Help" => "Ohje",
+"Access forbidden" => "Pääsy estetty",
+"Cloud not found" => "Pilveä ei löydy",
+"Edit categories" => "Muokkaa luokkia",
+"Add" => "Lisää",
+"Create an <strong>admin account</strong>" => "Luo <strong>ylläpitäjän tunnus</strong>",
 "Password" => "Salasana",
+"Advanced" => "Lisäasetukset",
+"Data folder" => "Datakansio",
+"Configure the database" => "Muokkaa tietokantaa",
+"will be used" => "käytetään",
+"Database user" => "Tietokannan käyttäjä",
+"Database password" => "Tietokannan salasana",
+"Database name" => "Tietokannan nimi",
+"Database host" => "Tietokantapalvelin",
+"Finish setup" => "Viimeistele asennus",
+"web services under your control" => "verkkopalvelut hallinnassasi",
 "Log out" => "Kirjaudu ulos",
-"You are logged out." => "Olet kirjautunut ulos."
+"Settings" => "Asetukset",
+"Lost your password?" => "Unohditko salasanasi?",
+"remember" => "muista",
+"Log in" => "Kirjaudu sisään",
+"You are logged out." => "Olet kirjautunut ulos.",
+"prev" => "edellinen",
+"next" => "seuraava"
 );
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index ae080dc4bc..8d839a6ac6 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Non se indicou o nome do aplicativo.",
+"No category to add?" => "Sen categoría que engadir?",
+"This category already exists: " => "Esta categoría xa existe: ",
 "Owncloud password reset" => "Restablecemento do contrasinal de Owncloud",
+"ownCloud password reset" => "Restablecer contrasinal de ownCloud",
 "Use the following link to reset your password: {link}" => "Use a seguinte ligazón para restablecer o contrasinal: {link}",
 "You will receive a link to reset your password via Email." => "Recibirá unha ligazón por correo electrónico para restablecer o contrasinal",
 "Requested" => "Solicitado",
@@ -15,7 +19,10 @@
 "Apps" => "Aplicativos",
 "Admin" => "Admin",
 "Help" => "Axuda",
+"Access forbidden" => "Acceso denegado",
 "Cloud not found" => "Nube non atopada",
+"Edit categories" => "Editar categorias",
+"Add" => "Engadir",
 "Create an <strong>admin account</strong>" => "Crear unha <strong>contra de administrador</strong>",
 "Password" => "Contrasinal",
 "Advanced" => "Avanzado",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index f91d283118..1929681e06 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -1,10 +1,17 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "שם היישום לא סופק.",
+"No category to add?" => "אין קטגוריה להוספה?",
+"This category already exists: " => "קטגוריה זאת כבר קיימת: ",
+"Owncloud password reset" => "איפוס הססמה של ownCloud",
+"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." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
 "Requested" => "נדרש",
 "Login failed!" => "הכניסה נכשלה!",
 "Username" => "שם משתמש",
 "Request reset" => "בקשת איפוס",
 "Your password was reset" => "הססמה שלך אופסה",
+"To login page" => "לדף הכניסה",
 "New password" => "ססמה חדשה",
 "Reset password" => "איפוס ססמה",
 "Personal" => "אישי",
@@ -12,7 +19,10 @@
 "Apps" => "יישומים",
 "Admin" => "מנהל",
 "Help" => "עזרה",
+"Access forbidden" => "הגישה נחסמה",
 "Cloud not found" => "ענן לא נמצא",
+"Edit categories" => "עריכת הקטגוריות",
+"Add" => "הוספה",
 "Create an <strong>admin account</strong>" => "יצירת <strong>חשבון מנהל</strong>",
 "Password" => "ססמה",
 "Advanced" => "מתקדם",
@@ -24,11 +34,13 @@
 "Database name" => "שם מסד הנתונים",
 "Database host" => "שרת בסיס נתונים",
 "Finish setup" => "סיום התקנה",
+"web services under your control" => "שירותי רשת בשליטתך",
 "Log out" => "התנתקות",
 "Settings" => "הגדרות",
 "Lost your password?" => "שכחת את ססמתך?",
 "remember" => "שמירת הססמה",
-"You are logged out." => "אינך מחובר.",
-"prev" => "קודם",
+"Log in" => "כניסה",
+"You are logged out." => "לא התחברת.",
+"prev" => "הקודם",
 "next" => "הבא"
 );
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index f129ca7060..92be804804 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -1,34 +1,46 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Ime aplikacije nije pribavljeno.",
+"No category to add?" => "Nemate kategorija koje možete dodati?",
+"This category already exists: " => "Ova kategorija već postoji: ",
+"Owncloud password reset" => "ownCloud resetiranje lozinke",
+"ownCloud password reset" => "ownCloud resetiranje lozinke",
+"Use the following link to reset your password: {link}" => "Koristite ovaj link da biste poništili lozinku: {link}",
 "You will receive a link to reset your password via Email." => "Primit ćete link kako biste poništili zaporku putem e-maila.",
 "Requested" => "Zahtijevano",
 "Login failed!" => "Prijava nije uspjela!",
 "Username" => "Korisničko ime",
 "Request reset" => "Zahtjev za resetiranjem",
 "Your password was reset" => "Vaša lozinka je resetirana",
-"New password" => "nova lozinka",
-"Reset password" => "poništavanje lozinke",
+"To login page" => "Idi na stranicu za prijavu",
+"New password" => "Nova lozinka",
+"Reset password" => "Poništavanje lozinke",
 "Personal" => "Osobno",
-"Users" => "korisnici",
-"Apps" => "aplikacije",
-"Admin" => "administrator",
-"Help" => "pomoć",
+"Users" => "Korisnici",
+"Apps" => "Aplikacije",
+"Admin" => "Administrator",
+"Help" => "Pomoć",
+"Access forbidden" => "Pristup zabranjen",
 "Cloud not found" => "Cloud nije pronađen",
-"Create an <strong>admin account</strong>" => "stvoriti <strong>Administratorski račun</strong>",
+"Edit categories" => "Uredi kategorije",
+"Add" => "Dodaj",
+"Create an <strong>admin account</strong>" => "Stvori <strong>administratorski račun</strong>",
 "Password" => "Lozinka",
 "Advanced" => "Dodatno",
 "Data folder" => "Mapa baze podataka",
-"Configure the database" => "konfigurirati baze podataka",
+"Configure the database" => "Konfiguriraj bazu podataka",
 "will be used" => "će se koristiti",
-"Database user" => "korisnik baze podataka",
-"Database password" => "lozinka baze podataka",
-"Database name" => "ime baze podataka",
+"Database user" => "Korisnik baze podataka",
+"Database password" => "Lozinka baze podataka",
+"Database name" => "Ime baze podataka",
 "Database host" => "Poslužitelj baze podataka",
-"Finish setup" => "završiti postavljanje",
-"Log out" => "odjaviti",
-"Settings" => "postavke",
+"Finish setup" => "Završi postavljanje",
+"web services under your control" => "web usluge pod vašom kontrolom",
+"Log out" => "Odjava",
+"Settings" => "Postavke",
 "Lost your password?" => "Izgubili ste lozinku?",
 "remember" => "zapamtiti",
-"You are logged out." => "Vi ste odjavljeni.",
+"Log in" => "Prijava",
+"You are logged out." => "Odjavljeni ste.",
 "prev" => "prethodan",
 "next" => "sljedeći"
 );
diff --git a/core/l10n/id.php b/core/l10n/id.php
index eb20a4209c..f9fa7d2bb9 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -1,11 +1,28 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Nama aplikasi tidak diberikan.",
+"No category to add?" => "Tidak ada kategori yang akan ditambahkan?",
+"This category already exists: " => "Kategori ini sudah ada:",
+"Owncloud password reset" => "Reset password Owncloud",
+"ownCloud password reset" => "reset password ownCloud",
+"Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk mereset password anda: {link}",
+"You will receive a link to reset your password via Email." => "Anda akan mendapatkan link untuk mereset password anda lewat Email.",
+"Requested" => "Telah diminta",
+"Login failed!" => "Login gagal!",
 "Username" => "Username",
+"Request reset" => "Meminta reset",
+"Your password was reset" => "Password anda telah direset",
+"To login page" => "Ke halaman login",
+"New password" => "Password baru",
+"Reset password" => "Reset password",
 "Personal" => "Pribadi",
 "Users" => "Pengguna",
 "Apps" => "Aplikasi",
 "Admin" => "Admin",
 "Help" => "Bantuan",
+"Access forbidden" => "Akses Ditiadakan",
 "Cloud not found" => "Cloud tidak ditemukan",
+"Edit categories" => "Edit kategori",
+"Add" => "Tambahkan",
 "Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>",
 "Password" => "Password",
 "Advanced" => "Tingkat Lanjut",
@@ -17,10 +34,12 @@
 "Database name" => "Nama database",
 "Database host" => "Host database",
 "Finish setup" => "Selesaikan instalasi",
+"web services under your control" => "web service dibawah kontrol anda",
 "Log out" => "Keluar",
 "Settings" => "Setelan",
 "Lost your password?" => "Lupa password anda?",
 "remember" => "selalu login",
+"Log in" => "Masuk",
 "You are logged out." => "Anda telah keluar.",
 "prev" => "sebelum",
 "next" => "selanjutnya"
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 3584bf6732..50b8e9e616 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -1,11 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "アプリケーション名は提供されていません。",
+"No category to add?" => "追加するカテゴリはありませんか？",
+"This category already exists: " => "このカテゴリはすでに存在します: ",
 "Owncloud password reset" => "Owncloud のパスワードをリセット",
+"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." => "パスワードをリセットするリンクがメールで届きます。",
+"You will receive a link to reset your password via Email." => "メールでパスワードをリセットするリンクが届きます。",
 "Requested" => "送信されました",
-"Login failed!" => "ログインに失敗しました。",
+"Login failed!" => "ログインに失敗しました！",
 "Username" => "ユーザ名",
-"Request reset" => "リセットを要求する。",
+"Request reset" => "リセットを要求します。",
 "Your password was reset" => "あなたのパスワードはリセットされました。",
 "To login page" => "ログインページへ戻る",
 "New password" => "新しいパスワードを入力",
@@ -15,7 +19,10 @@
 "Apps" => "アプリ",
 "Admin" => "管理者",
 "Help" => "ヘルプ",
-"Cloud not found" => "見つけられません",
+"Access forbidden" => "アクセスが禁止されています",
+"Cloud not found" => "見つかりません",
+"Edit categories" => "カテゴリを編集",
+"Add" => "追加",
 "Create an <strong>admin account</strong>" => "<strong>管理者アカウント</strong>を作成してください",
 "Password" => "パスワード",
 "Advanced" => "詳細設定",
@@ -30,7 +37,7 @@
 "web services under your control" => "管理下にあるウェブサービス",
 "Log out" => "ログアウト",
 "Settings" => "設定",
-"Lost your password?" => "パスワードがわからなくなりましたか？",
+"Lost your password?" => "パスワードを忘れましたか？",
 "remember" => "パスワードを記憶する",
 "Log in" => "ログイン",
 "You are logged out." => "ログアウトしました。",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index d663b6dc42..dd94201138 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -1,10 +1,17 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Numm vun der Applikatioun ass net uginn.",
+"No category to add?" => "Keng Kategorie fir bäizesetzen?",
+"This category already exists: " => "Des Kategorie existéiert schonn:",
+"Owncloud password reset" => "Owncloud Passwuert reset",
+"ownCloud password reset" => "ownCloud Passwuert reset",
+"Use the following link to reset your password: {link}" => "Benotz folgende Link fir däi Passwuert ze reseten: {link}",
 "You will receive a link to reset your password via Email." => "Du kriss en Link fir däin Passwuert nei ze setzen via Email geschéckt.",
 "Requested" => "Gefrot",
 "Login failed!" => "Falschen Login!",
 "Username" => "Benotzernumm",
 "Request reset" => "Reset ufroen",
 "Your password was reset" => "Dän Passwuert ass zeréck gesat gin",
+"To login page" => "Op d'Login Säit",
 "New password" => "Neit Passwuert",
 "Reset password" => "Passwuert zeréck setzen",
 "Personal" => "Perséinlech",
@@ -12,7 +19,10 @@
 "Apps" => "Applicatiounen",
 "Admin" => "Admin",
 "Help" => "Hëllef",
+"Access forbidden" => "Access net erlaabt",
 "Cloud not found" => "Cloud net fonnt",
+"Edit categories" => "Kategorien editéieren",
+"Add" => "Bäisetzen",
 "Create an <strong>admin account</strong>" => "En <strong>Admin Account</strong> uleeën",
 "Password" => "Passwuert",
 "Advanced" => "Erweidert",
@@ -24,10 +34,12 @@
 "Database name" => "Datebank Numm",
 "Database host" => "Datebank Server",
 "Finish setup" => "Installatioun ofschléissen",
+"web services under your control" => "Web Servicer ënnert denger Kontroll",
 "Log out" => "Ausloggen",
 "Settings" => "Astellungen",
 "Lost your password?" => "Passwuert vergiess?",
 "remember" => "verhalen",
+"Log in" => "Log dech an",
 "You are logged out." => "Du bass ausgeloggt.",
 "prev" => "zeréck",
 "next" => "weider"
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 6828a07886..5dedfffabd 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
+"This category already exists: " => "Tokia kategorija jau yra:",
 "Owncloud password reset" => "Owncloud slaptažodžio atkūrimas",
+"ownCloud password reset" => "ownCloud slaptažodžio atkūrimas",
 "Use the following link to reset your password: {link}" => "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
 "You will receive a link to reset your password via Email." => "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
 "Requested" => "Užklausta",
@@ -15,7 +17,10 @@
 "Apps" => "Programos",
 "Admin" => "Administravimas",
 "Help" => "Pagalba",
+"Access forbidden" => "Priėjimas draudžiamas",
 "Cloud not found" => "Negalima rasti",
+"Edit categories" => "Redaguoti kategorijas",
+"Add" => "Pridėti",
 "Create an <strong>admin account</strong>" => "Sukurti <strong>administratoriaus paskyrą</strong>",
 "Password" => "Slaptažodis",
 "Advanced" => "Išplėstiniai",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 9222a4f703..80b9da0e1e 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Applikasjonsnavn ikke angitt.",
+"No category to add?" => "Ingen kategorier å legge til?",
+"This category already exists: " => "Denne kategorien finnes allerede:",
 "Owncloud password reset" => "OwnCloud passordtilbakestilling",
+"ownCloud password reset" => "Tilbakestill ownCloud passord",
 "Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
 "You will receive a link to reset your password via Email." => "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
 "Requested" => "Anmodning",
@@ -15,7 +19,10 @@
 "Apps" => "Apper",
 "Admin" => "Admin",
 "Help" => "Hjelp",
+"Access forbidden" => "Tilgang nektet",
 "Cloud not found" => "Sky ikke funnet",
+"Edit categories" => "Rediger kategorier",
+"Add" => "Legg til",
 "Create an <strong>admin account</strong>" => "opprett en <strong>administrator-konto</strong>",
 "Password" => "Passord",
 "Advanced" => "Avansert",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 47ad9d0a40..3c6f28c856 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Brak nazwy dla aplikacji",
+"No category to add?" => "Brak kategorii",
+"This category already exists: " => "Ta kategoria już istnieje",
 "Owncloud password reset" => "Resetowanie hasła",
+"ownCloud password reset" => "restart hasła",
 "Use the following link to reset your password: {link}" => "Proszę użyć tego odnośnika do zresetowania hasła: {link}",
 "You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
 "Requested" => "Żądane",
@@ -15,7 +19,10 @@
 "Apps" => "Programy",
 "Admin" => "Administrator",
 "Help" => "Pomoc",
+"Access forbidden" => "Dostęp zabroniony",
 "Cloud not found" => "Nie odnaleziono chmury",
+"Edit categories" => "Edytuj kategorię",
+"Add" => "Dodaj",
 "Create an <strong>admin account</strong>" => "Tworzenie <strong>konta administratora</strong>",
 "Password" => "Hasło",
 "Advanced" => "Zaawansowane",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 93cd551976..55c4c96e5c 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Nome da aplicação não definida.",
+"No category to add?" => "Nenhuma categoria para adicionar?",
+"This category already exists: " => "Esta categoria já existe:",
 "Owncloud password reset" => "Redefinir palavra-chave ownCloud",
+"ownCloud password reset" => "Reposição da password ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}",
 "You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password",
 "Requested" => "Pedido",
@@ -15,7 +19,10 @@
 "Apps" => "Aplicações",
 "Admin" => "Admin",
 "Help" => "Ajuda",
+"Access forbidden" => "Acesso interdito",
 "Cloud not found" => "Cloud nao encontrada",
+"Edit categories" => "Editar categorias",
+"Add" => "Adicionar",
 "Create an <strong>admin account</strong>" => "Criar uma <strong>conta administrativa</strong>",
 "Password" => "Palavra chave",
 "Advanced" => "Avançado",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 6f8256cea4..b6170d8e96 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Numele aplicație nu este furnizat.",
+"No category to add?" => "Nici o categorie de adăugat?",
+"This category already exists: " => "Această categorie deja există:",
 "Owncloud password reset" => "Resetarea parolei ownCloud",
+"ownCloud password reset" => "Resetarea parolei ownCloud ",
 "Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}",
 "You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email",
 "Requested" => "Solicitat",
@@ -15,7 +19,10 @@
 "Apps" => "Aplicații",
 "Admin" => "Administrator",
 "Help" => "Ajutor",
+"Access forbidden" => "Acces interzis",
 "Cloud not found" => "Nu s-a găsit",
+"Edit categories" => "Editează categoriile",
+"Add" => "Adaugă",
 "Create an <strong>admin account</strong>" => "Crează un <strong>cont de administrator</strong>",
 "Password" => "Parola",
 "Advanced" => "Avansat",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 0fe8c079f2..ff86f29b26 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Имя приложения не установлено.",
+"No category to add?" => "Нет категорий для добавления?",
+"This category already exists: " => "Эта категория уже существует: ",
 "Owncloud password reset" => "Сброс пароля OwnCloud",
+"ownCloud password reset" => "Сброс пароля ",
 "Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
 "You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.",
 "Requested" => "Запрошено",
@@ -15,7 +19,10 @@
 "Apps" => "Приложения",
 "Admin" => "Администратор",
 "Help" => "Помощь",
+"Access forbidden" => "Доступ запрещён",
 "Cloud not found" => "Облако не найдено",
+"Edit categories" => "Редактировать категории",
+"Add" => "Добавить",
 "Create an <strong>admin account</strong>" => "Создать <strong>учётную запись администратора</strong>",
 "Password" => "Пароль",
 "Advanced" => "Дополнительно",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 99fca3619f..fd53952184 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Programnamn har inte angetts",
+"No category to add?" => "Ingen kategori att lägga till?",
+"This category already exists: " => "Denna kategori finns redan:",
 "Owncloud password reset" => "Owncloud lösenordsåterställning",
+"ownCloud password reset" => "ownCloud lösenordsåterställning",
 "Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {link}",
 "You will receive a link to reset your password via Email." => "Du får en länk att återställa ditt lösenord via e-post.",
 "Requested" => "Begärd",
@@ -15,7 +19,10 @@
 "Apps" => "Program",
 "Admin" => "Admin",
 "Help" => "Hjälp",
+"Access forbidden" => "Åtkomst förbjuden",
 "Cloud not found" => "Hittade inget moln",
+"Edit categories" => "Redigera kategorier",
+"Add" => "Lägg till",
 "Create an <strong>admin account</strong>" => "Skapa ett <strong>administratörskonto</strong>",
 "Password" => "Lösenord",
 "Advanced" => "Avancerat",
diff --git a/core/minimizer.php b/core/minimizer.php
new file mode 100644
index 0000000000..6828acc87d
--- /dev/null
+++ b/core/minimizer.php
@@ -0,0 +1,14 @@
+<?php
+
+OC_App::loadApps();
+
+if ($service == 'core.css'){
+	$minimizer = new OC_Minimizer_CSS();
+	$files = $minimizer->findFiles(OC_Util::$core_styles);
+	$minimizer->output($files);
+}
+else if ($service == 'core.js'){
+	$minimizer = new OC_Minimizer_JS();
+	$files = $minimizer->findFiles(OC_Util::$core_scripts);
+	$minimizer->output($files);
+}
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 7ba7abdbf1..7f5a4d50fc 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -4,6 +4,9 @@
 		<title>ownCloud</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+		<?php if (!defined('DEBUG') || !DEBUG): ?>
+		<link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" />
+		<?php endif ?>
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
@@ -11,6 +14,9 @@
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
 			var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
 		</script>
+		<?php if (!defined('DEBUG') || !DEBUG): ?>
+		<script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
+		<?php endif ?>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index e9d105ed04..8f6c029007 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -4,6 +4,9 @@
 		<title><?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+		<?php if (!defined('DEBUG') || !DEBUG): ?>
+		<link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" />
+		<?php endif ?>
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
@@ -12,6 +15,9 @@
 			var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
 			var oc_current_user = '<?php echo OC_User::getUser() ?>';
 		</script>
+		<?php if (!defined('DEBUG') || !DEBUG): ?>
+		<script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
+		<?php endif ?>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
diff --git a/l10n/af/calendar.po b/l10n/af/calendar.po
index 1ab9a09ac7..80a29a27bf 100644
--- a/l10n/af/calendar.po
+++ b/l10n/af/calendar.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2011-09-03 16:52+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,16 +41,40 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr ""
diff --git a/l10n/af/contacts.po b/l10n/af/contacts.po
index 5bb8d1af22..c71bea4932 100644
--- a/l10n/af/contacts.po
+++ b/l10n/af/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -81,23 +81,20 @@ msgstr ""
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -121,14 +118,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -145,7 +174,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,102 +190,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -427,6 +583,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -583,7 +743,7 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -611,27 +771,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/af/core.po b/l10n/af/core.po
index bebd27cfa2..ad5808d2ff 100644
--- a/l10n/af/core.po
+++ b/l10n/af/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,6 +29,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr ""
@@ -159,15 +235,15 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr ""
 
diff --git a/l10n/af/files.po b/l10n/af/files.po
index d2ea9dc44c..142439d4d9 100644
--- a/l10n/af/files.po
+++ b/l10n/af/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,10 +47,62 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr ""
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr ""
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -119,18 +171,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:55
-msgid "Size"
-msgstr ""
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr ""
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr ""
diff --git a/l10n/af/gallery.po b/l10n/af/gallery.po
index 0c8fe687eb..4b3c3a0b90 100644
--- a/l10n/af/gallery.po
+++ b/l10n/af/gallery.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,10 +17,50 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr ""
@@ -33,10 +73,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr ""
diff --git a/l10n/af/media.po b/l10n/af/media.po
index bca7b9059b..6ef8fb9064 100644
--- a/l10n/af/media.po
+++ b/l10n/af/media.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,6 +21,10 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr ""
diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index 7429b43477..c861f1ae1c 100644
--- a/l10n/af/settings.po
+++ b/l10n/af/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,23 +18,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
 msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr ""
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr ""
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr ""
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -55,10 +70,14 @@ msgid "Select an App"
 msgstr ""
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr ""
 
diff --git a/l10n/ar/calendar.po b/l10n/ar/calendar.po
index 8d457e0e30..ac28bf5223 100644
--- a/l10n/ar/calendar.po
+++ b/l10n/ar/calendar.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -42,77 +42,101 @@ msgstr "تم تغيير المنطقة الزمنية"
 msgid "Invalid request"
 msgstr "طلب غير مفهوم"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "الجدول الزمني"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "عيد ميلاد"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "عمل"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "إتصال"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "الزبائن"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "المرسل"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "عطلة"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "أفكار"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "رحلة"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "يوبيل"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "إجتماع"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "شيء آخر"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "شخصي"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "مشاريع"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "اسئلة"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "العمل"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index cf44000cd9..518656c953 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -82,23 +82,20 @@ msgstr "خطء خلال اضافة كتاب عناوين."
 msgid "Error activating addressbook."
 msgstr "خطء خلال تفعيل كتاب العناوين."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,14 +119,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -146,7 +175,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "خطء خلال تعديل الصفه."
 
@@ -162,102 +191,229 @@ msgstr "خطء خلال تعديل كتاب العناوين"
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "المعارف"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "هذا ليس دفتر عناوينك."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "لم يتم العثور على الشخص."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "عنوان"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "الهاتف"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "البريد الالكتروني"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "المؤسسة"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "الوظيفة"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "البيت"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "الهاتف المحمول"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "معلومات إضافية"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "صوت"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "الفاكس"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "الفيديو"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "الرنان"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -428,6 +584,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -584,7 +744,7 @@ msgid "Submit"
 msgstr "ارسال"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "الغاء"
 
@@ -612,27 +772,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 05a0ed7c96..049f3ebca5 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -30,6 +30,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "استرجاع كلمة السر"
@@ -160,15 +236,15 @@ msgstr "خادم قاعدة البيانات"
 msgid "Finish setup"
 msgstr "انهاء التعديلات"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "خدمات الوب تحت تصرفك"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "الخروج"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "تعديلات"
 
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index a3423d18db..eaf684ef80 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -48,10 +48,62 @@ msgstr "المجلد المؤقت غير موجود"
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "الملفات"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "حجم"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "معدل"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -120,18 +172,6 @@ msgstr ""
 msgid "Download"
 msgstr "تحميل"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "حجم"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "معدل"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "محذوف"
diff --git a/l10n/ar/gallery.po b/l10n/ar/gallery.po
index 1a2fab06f7..ad8e0279b3 100644
--- a/l10n/ar/gallery.po
+++ b/l10n/ar/gallery.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "اعادة البحث"
@@ -34,10 +74,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "رجوع"
diff --git a/l10n/ar/media.po b/l10n/ar/media.po
index 994a68fb37..60e237f0d3 100644
--- a/l10n/ar/media.po
+++ b/l10n/ar/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "الموسيقى"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "إلعب"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "تجميد"
 
@@ -34,7 +38,7 @@ msgstr "تجميد"
 msgid "Previous"
 msgstr "السابق"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "التالي"
 
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 7ce9b5bb7e..60fc1db8e1 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -20,23 +20,38 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "تم تغير العنوان البريدي"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "طلبك غير مفهوم"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "تم تغيير ال OpenID"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "طلبك غير مفهوم"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "تم تغيير اللغة"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -57,10 +72,14 @@ msgid "Select an App"
 msgstr "إختر تطبيقاً"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-مسجل"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "من قبل"
 
diff --git a/l10n/bg_BG/calendar.po b/l10n/bg_BG/calendar.po
index 8dabe1dddc..7edfe71490 100644
--- a/l10n/bg_BG/calendar.po
+++ b/l10n/bg_BG/calendar.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -42,77 +42,101 @@ msgstr "Часовата зона е сменена"
 msgid "Invalid request"
 msgstr "Невалидна заявка"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Календар"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
-msgid "Birthday"
-msgstr ""
-
-#: lib/app.php:123
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:124
-msgid "Call"
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
 msgstr ""
 
 #: lib/app.php:125
-msgid "Clients"
+msgid "Birthday"
 msgstr ""
 
 #: lib/app.php:126
-msgid "Deliverer"
+msgid "Business"
 msgstr ""
 
 #: lib/app.php:127
-msgid "Holidays"
+msgid "Call"
 msgstr ""
 
 #: lib/app.php:128
-msgid "Ideas"
+msgid "Clients"
 msgstr ""
 
 #: lib/app.php:129
-msgid "Journey"
+msgid "Deliverer"
 msgstr ""
 
 #: lib/app.php:130
-msgid "Jubilee"
+msgid "Holidays"
 msgstr ""
 
 #: lib/app.php:131
-msgid "Meeting"
+msgid "Ideas"
 msgstr ""
 
 #: lib/app.php:132
-msgid "Other"
+msgid "Journey"
 msgstr ""
 
 #: lib/app.php:133
-msgid "Personal"
+msgid "Jubilee"
 msgstr ""
 
 #: lib/app.php:134
-msgid "Projects"
+msgid "Meeting"
 msgstr ""
 
 #: lib/app.php:135
-msgid "Questions"
+msgid "Other"
 msgstr ""
 
 #: lib/app.php:136
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:137
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:138
+msgid "Questions"
+msgstr ""
+
+#: lib/app.php:139
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index 635458a04e..40582ffea9 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -81,23 +81,20 @@ msgstr ""
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -121,14 +118,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -145,7 +174,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,102 +190,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -427,6 +583,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -583,7 +743,7 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -611,27 +771,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index c1f2d0277f..477b4f2e81 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -9,9 +9,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -32,6 +32,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr ""
@@ -162,15 +238,15 @@ msgstr "Хост за базата"
 msgid "Finish setup"
 msgstr "Завършване на настройките"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Изход"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Настройки"
 
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index a9471ab914..e81c2f2a9c 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -48,10 +48,62 @@ msgstr "Липсва временната папка"
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Файлове"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Размер"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Променено"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -120,18 +172,6 @@ msgstr ""
 msgid "Download"
 msgstr "Изтегляне"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Размер"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Променено"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Изтриване"
diff --git a/l10n/bg_BG/gallery.po b/l10n/bg_BG/gallery.po
index 16afafc20f..2bf1a654c1 100644
--- a/l10n/bg_BG/gallery.po
+++ b/l10n/bg_BG/gallery.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,50 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr ""
@@ -33,10 +73,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr ""
diff --git a/l10n/bg_BG/media.po b/l10n/bg_BG/media.po
index ae35b6d25e..16a6c478ec 100644
--- a/l10n/bg_BG/media.po
+++ b/l10n/bg_BG/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Музика"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Пусни"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Пауза"
 
@@ -34,7 +38,7 @@ msgstr "Пауза"
 msgid "Previous"
 msgstr "Предишна"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Следваща"
 
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index fcba03ef49..b997c96de7 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -20,23 +20,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Невалидна заявка"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID е сменено"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Невалидна заявка"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Езика е сменен"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -57,10 +72,14 @@ msgid "Select an App"
 msgstr "Изберете програма"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-лицензирано"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "от"
 
diff --git a/l10n/ca/calendar.po b/l10n/ca/calendar.po
index 09d8ca6da7..f4527ce92e 100644
--- a/l10n/ca/calendar.po
+++ b/l10n/ca/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 11:26+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,16 +43,40 @@ msgstr "La zona horària ha canviat"
 msgid "Invalid request"
 msgstr "Sol.licitud no vàlida"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendari"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Aniversari"
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index d551cb21cb..cc7086cd14 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -83,23 +83,20 @@ msgstr "Error en afegir la llibreta d'adreces."
 msgid "Error activating addressbook."
 msgstr "Error en activar la llibreta d'adreces."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "No s'ha tramès cap ID de contacte."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Error en carregar la imatge."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Error en llegir la foto del contacte."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Error en desar el fitxer temporal."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "La foto carregada no és vàlida."
 
@@ -123,14 +120,46 @@ msgstr "falta la ID del contacte."
 msgid "Missing contact id."
 msgstr "Falta la id del contacte."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "No heu tramès el camí de la foto."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "El fitxer no existeix:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Error en carregar la imatge."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "no s'ha establert el nom de l'element."
@@ -147,7 +176,7 @@ msgstr "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:"
 msgid "Something went FUBAR. "
 msgstr "Alguna cosa ha anat FUBAR."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Error en actualitzar la propietat del contacte."
 
@@ -163,102 +192,229 @@ msgstr "Error en actualitzar la llibreta d'adreces."
 msgid "Error uploading contacts to storage."
 msgstr "Error en carregar contactes a l'emmagatzemament."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "No hi ha errors, el fitxer s'ha carregat correctament"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "El fitxer carregat supera la directiva upload_max_filesize de php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El fitxer carregat supera la directiva MAX_FILE_SIZE especificada al formulari HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "El fitxer només s'ha carregat parcialment"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "No s'ha carregat cap fitxer"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Falta un fitxer temporal"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contactes"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Elimina un fitxer VCF per importar contactes."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "No s'ha trobat la llibreta d'adreces."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Aquesta no és la vostra llibreta d'adreces"
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "No s'ha trobat el contacte."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adreça"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telèfon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organització"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Feina"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mòbil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Veu"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Missatge"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Paginador"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -429,6 +585,10 @@ msgstr "Carrega una foto nova"
 msgid "Select photo from ownCloud"
 msgstr "Selecciona una foto de ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Edita l'adreça"
@@ -585,7 +745,7 @@ msgid "Submit"
 msgstr "Envia"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -613,27 +773,22 @@ msgstr "Importa"
 msgid "Importing contacts"
 msgstr "S'estan important contactes"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Els contactes s'han importat correctament"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Tanca el diàleg"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Importa la llibreta d'adreces"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Seleccioneu la llibreta d'adreces a la que voleu importar:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Elimina un fitxer VCF per importar contactes."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Selecciona de HD"
 
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 83fd152249..361164d2ef 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 11:23+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,6 +31,82 @@ msgstr "No voleu afegir cap categoria?"
 msgid "This category already exists: "
 msgstr "Aquesta categoria ja existeix:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Restableix la contrasenya d'Owncloud"
@@ -161,15 +237,15 @@ msgstr "Ordinador central de la base de dades"
 msgid "Finish setup"
 msgstr "Acaba la configuració"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "controleu els vostres serveis web"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Surt"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Arranjament"
 
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 9fa0e17c56..0d3c2693b4 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 11:30+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "S'ha perdut un fitxer temporal"
 msgid "Failed to write to disk"
 msgstr "Ha fallat en escriure al disc"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Fitxers"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Mida"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modificat"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Gestió de fitxers"
@@ -121,18 +173,6 @@ msgstr "Comparteix"
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Mida"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modificat"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Esborra-ho tot"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Suprimeix"
diff --git a/l10n/ca/gallery.po b/l10n/ca/gallery.po
index 6cdc8d07e4..72f3cf5c80 100644
--- a/l10n/ca/gallery.po
+++ b/l10n/ca/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 13:38+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Fotos"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Arranjament"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Escaneja de nou"
@@ -34,10 +74,6 @@ msgstr "Atura"
 msgid "Share"
 msgstr "Comparteix"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Arranjament"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Enrera"
diff --git a/l10n/ca/media.po b/l10n/ca/media.po
index 1889e043b9..4d41f39ffe 100644
--- a/l10n/ca/media.po
+++ b/l10n/ca/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Música"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Reprodueix"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pausa"
 
@@ -34,7 +38,7 @@ msgstr "Pausa"
 msgid "Previous"
 msgstr "Anterior"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Següent"
 
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 4c4063a5b8..62b4b97539 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 11:28+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,23 +20,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "el correu electrònic ha canviat"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Sol.licitud no vàlida"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID ha canviat"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Sol.licitud no vàlida"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "S'ha canviat l'idioma"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Català"
 
@@ -57,10 +72,14 @@ msgid "Select an App"
 msgstr "Seleccioneu una aplicació"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "- amb llicència"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "de"
 
diff --git a/l10n/cs_CZ/calendar.po b/l10n/cs_CZ/calendar.po
index 5dca39cef6..4bc27d16c6 100644
--- a/l10n/cs_CZ/calendar.po
+++ b/l10n/cs_CZ/calendar.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 08:18+0000\n"
-"Last-Translator: Michal Hrušecký <Michal@hrusecky.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,16 +44,40 @@ msgstr "Časová zóna byla změněna"
 msgid "Invalid request"
 msgstr "Chybný požadavek"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalendář"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d. MMM[ yyyy]{ '&#8212;' d.[ MMM] yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Narozeniny"
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index 96ed72095b..6c392a1f09 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 08:20+0000\n"
-"Last-Translator: Michal Hrušecký <Michal@hrusecky.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,23 +84,20 @@ msgstr "Chyba při přidávání adresáře."
 msgid "Error activating addressbook."
 msgstr "Chyba při aktivaci adresáře."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Nebylo nastaveno ID kontaktu."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Chyba při načítání obrázku."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Chyba při načítání fotky kontaktu."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Chyba při ukládání dočasného souboru."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Načítaná fotka je vadná."
 
@@ -124,14 +121,46 @@ msgstr "Chybí ID kontaktu."
 msgid "Missing contact id."
 msgstr "Chybí id kontaktu."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Žádná fotka nebyla nahrána."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Soubor neexistuje:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Chyba při načítání obrázku."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "jméno elementu není nastaveno."
@@ -148,7 +177,7 @@ msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
 msgid "Something went FUBAR. "
 msgstr "Něco se pokazilo. "
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Chyba při aktualizaci údaje kontaktu."
 
@@ -164,102 +193,229 @@ msgstr "Chyba při aktualizaci adresáře."
 msgid "Error uploading contacts to storage."
 msgstr "Chyba při nahrávání kontaktů do úložiště."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Nevyskytla se žádná chyba, soubor byl úspěšně nahrán"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Nahrávaný soubor překračuje nastavení upload_max_filesize directive v php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Nahrávaný soubor překračuje nastavení MAX_FILE_SIZE z voleb HTML formuláře"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Nahrávaný soubor se nahrál pouze z části"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Žádný soubor nebyl nahrán"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Chybí dočasný adresář"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Pro import kontaktů sem přetáhněte soubor VCF"
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Adresář nenalezen."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Toto není Váš adresář."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontakt nebyl nalezen."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizace"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Pracovní"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Domácí"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Hlas"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Zpráva"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -430,6 +586,10 @@ msgstr "Nahrát novou fotku"
 msgid "Select photo from ownCloud"
 msgstr "Vybrat fotku z ownCloudu"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Upravit adresu"
@@ -495,7 +655,7 @@ msgstr "Slečna"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Ms"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
@@ -539,11 +699,11 @@ msgstr "MUDr."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
@@ -586,7 +746,7 @@ msgid "Submit"
 msgstr "Potvrdit"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Storno"
 
@@ -614,27 +774,22 @@ msgstr "Import"
 msgid "Importing contacts"
 msgstr "Importování kontaktů"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Kontakty úspěšně importovány"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Zavírací dialog"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Importovat adresář"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Vyberte adresář do kterého chcete importovat:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Pro import kontaktů sem přetáhněte soubor VCF"
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Vybrat z disku"
 
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index baf8d5f7c9..594e0635dc 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 20:06+0000\n"
-"Last-Translator: Michal Hrušecký <Michal@hrusecky.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,6 +32,82 @@ msgstr "Žádná kategorie k přidání?"
 msgid "This category already exists: "
 msgstr "Tato kategorie již existuje:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Reset hesla Owncloud"
@@ -162,15 +238,15 @@ msgstr "Hostitel databáze"
 msgid "Finish setup"
 msgstr "Dokončit instalaci"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "webové služby pod Vaší kontrolou"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Odhlásit se"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Nastavení"
 
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index fed33acacd..23b3d0b036 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 21:11+0000\n"
-"Last-Translator: Michal Hrušecký <Michal@hrusecky.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "Chybí adresář pro sočasné soubory"
 msgid "Failed to write to disk"
 msgstr "Zápis na disk se nezdařil"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Soubory"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Velikost"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Změněno"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Nastavení chování k souborům"
@@ -121,18 +173,6 @@ msgstr "Sdílet"
 msgid "Download"
 msgstr "Stáhnout"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Velikost"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Změněno"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Smazat vše"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Vymazat"
diff --git a/l10n/cs_CZ/gallery.po b/l10n/cs_CZ/gallery.po
index e2c673ccec..08c9c2054b 100644
--- a/l10n/cs_CZ/gallery.po
+++ b/l10n/cs_CZ/gallery.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-12 15:21+0000\n"
-"Last-Translator: Michal Hrušecký <Michal@hrusecky.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,10 +20,50 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Obrázky"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Nastavení"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Znovu prohledat"
@@ -36,10 +76,6 @@ msgstr "Zastavit"
 msgid "Share"
 msgstr "Sdílet"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Nastavení"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Zpět"
diff --git a/l10n/cs_CZ/media.po b/l10n/cs_CZ/media.po
index d3b8f82371..adefdadc3b 100644
--- a/l10n/cs_CZ/media.po
+++ b/l10n/cs_CZ/media.po
@@ -9,10 +9,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-04-06 17:13+0000\n"
-"Last-Translator: Michal Hrušecký <Michal@hrusecky.net>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,15 +20,19 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Hudba"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Přehrát"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pauza"
 
@@ -36,7 +40,7 @@ msgstr "Pauza"
 msgid "Previous"
 msgstr "Předchozí"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Další"
 
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 4852d3dfe6..360a7fe9d9 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-12 16:13+0000\n"
-"Last-Translator: Michal Hrušecký <Michal@hrusecky.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,23 +23,38 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "email změněn"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Chybný dotaz"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID změněn"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Chybný dotaz"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Jazyk byl změněn"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Česky"
 
@@ -60,10 +75,14 @@ msgid "Select an App"
 msgstr "Vyberte aplikaci"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licencováno"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "podle"
 
diff --git a/l10n/da/calendar.po b/l10n/da/calendar.po
index d1b46364a7..7207ff883e 100644
--- a/l10n/da/calendar.po
+++ b/l10n/da/calendar.po
@@ -6,12 +6,13 @@
 #   <mikkelbjerglarsen@gmail.com>, 2011.
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
+# Thomas Tanghus <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -22,11 +23,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Der blev ikke fundet nogen kalendere."
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Der blev ikke fundet nogen begivenheder."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -44,79 +45,103 @@ msgstr "Tidszone ændret"
 msgid "Invalid request"
 msgstr "Ugyldig forespørgsel"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ åååå]{ '&#8212;'[ MMM] d åååå}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Forretning"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Ring"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Kunder"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Leverance"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Helligdage"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Ideér"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Rejse"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Jubilæum"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Møde"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Andet"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Privat"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Projekter"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Spørgsmål"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Arbejde"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "unavngivet"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -365,7 +390,7 @@ msgstr "Vælg aktive kalendere"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Dine kalendere"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -374,15 +399,15 @@ msgstr "CalDav-link"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Delte kalendere"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Ingen delte kalendere"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Del kalender"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -399,7 +424,7 @@ msgstr "Slet"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "delt af dig"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -444,23 +469,23 @@ msgstr "Eksporter"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Begivenhedsinfo"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Gentagende"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Alarm"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Deltagere"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Del"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -472,11 +497,11 @@ msgstr "Kategori"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Opdel kategorier med kommaer"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Rediger kategorier"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -597,11 +622,11 @@ msgstr "Opret en ny begivenhed"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Vis en begivenhed"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "Ingen categorier valgt"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -609,11 +634,11 @@ msgstr "Vælg kategori"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "fra"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "kl."
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -637,7 +662,7 @@ msgstr "12T"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "Ugens første dag"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
@@ -645,24 +670,24 @@ msgstr "Synkroniseringsadresse til CalDAV:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Brugere"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "Vælg brugere"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Redigerbar"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Grupper"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "Vælg grupper"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "Offentliggør"
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index 03977ebbdd..be2ce3917f 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.po
@@ -6,12 +6,13 @@
 #   <mikkelbjerglarsen@gmail.com>, 2011.
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
+# Thomas Tanghus <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +39,7 @@ msgstr "Der skal udfyldes mindst et adressefelt."
 
 #: ajax/addproperty.php:62
 msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "Kan ikke tilføje overlappende element."
 
 #: ajax/addproperty.php:120
 msgid "Error adding contact property."
@@ -46,35 +47,35 @@ msgstr "Fejl ved tilføjelse af egenskab."
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "Intet ID medsendt"
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Kunne ikke sætte checksum."
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Der ikke valgt nogle grupper at slette."
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
-msgstr ""
+msgstr "Der blev ikke fundet nogen adressebøger."
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "Der blev ikke fundet nogen kontaktpersoner."
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
-msgstr ""
+msgstr "Manglende ID"
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "Kunne ikke indlæse VCard med ID'en: \""
 
 #: ajax/createaddressbook.php:18
 msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "Kan ikke tilføje adressebog uden et navn."
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
@@ -84,29 +85,26 @@ msgstr "Fejl ved tilføjelse af adressebog."
 msgid "Error activating addressbook."
 msgstr "Fejl ved aktivering af adressebog."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "Ingen ID for kontakperson medsendt."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Kunne ikke indlæse foto for kontakperson."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Kunne ikke gemme midlertidig fil."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
-msgstr ""
+msgstr "Billedet under indlæsning er ikke gyldigt."
 
 #: ajax/deletecard.php:37 ajax/saveproperty.php:58
 msgid "id is not set."
-msgstr ""
+msgstr "Intet ID medsendt."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -118,43 +116,75 @@ msgstr "Fejl ved sletning af egenskab for kontaktperson."
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "Kontaktperson ID mangler."
 
 #: ajax/loadphoto.php:44
 msgid "Missing contact id."
-msgstr ""
+msgstr "Kontaktperson ID mangler."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
+msgstr "Der blev ikke medsendt en sti til fotoet."
+
+#: ajax/oc_photo.php:48
+msgid "File doesn't exist:"
+msgstr "Filen eksisterer ikke:"
+
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Kunne ikke indlæse billede."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/oc_photo.php:51
-msgid "File doesn't exist:"
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
 msgstr ""
 
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
-msgstr ""
+msgstr "Element navnet er ikke medsendt."
 
 #: ajax/saveproperty.php:61
 msgid "checksum is not set."
-msgstr ""
+msgstr "Checksum er ikke medsendt."
 
 #: ajax/saveproperty.php:78
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: "
 
 #: ajax/saveproperty.php:83
 msgid "Something went FUBAR. "
-msgstr ""
+msgstr "Noget gik grueligt galt. "
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Fejl ved opdatering af egenskab for kontaktperson."
 
 #: ajax/updateaddressbook.php:20
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "Kan ikke opdatére adressebogen med et tomt navn."
 
 #: ajax/updateaddressbook.php:26
 msgid "Error updating addressbook."
@@ -162,110 +192,237 @@ msgstr "Fejl ved opdatering af adressebog"
 
 #: ajax/uploadimport.php:46 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Kunne ikke uploade kontaktepersoner til midlertidig opbevaring."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Der skete ingen fejl, filen blev succesfuldt uploadet"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Den uploadede fil er større end upload_max_filesize indstillingen i php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Den uploadede fil overstiger MAX_FILE_SIZE indstilingen, som specificeret i HTML formularen"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Filen blev kun delvist uploadet."
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Ingen fil uploadet"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
+msgstr "Manglende midlertidig mappe."
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontaktpersoner"
 
-#: lib/app.php:23
-msgid "Addressbook not found."
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: lib/app.php:27
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Drop en VCF fil for at importere kontaktpersoner."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
+msgid "Addressbook not found."
+msgstr "Adressebogen blev ikke fundet."
+
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Dette er ikke din adressebog."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontaktperson kunne ikke findes."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Arbejde"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Hjemme"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Telefonsvarer"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
-msgstr ""
+msgstr "Besked"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Personsøger"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
-msgstr ""
+msgstr "Internet"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "{name}'s fødselsdag"
 
 #: lib/search.php:22
 msgid "Contact"
@@ -281,7 +438,7 @@ msgstr "Adressebøger"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Konfigurer adressebøger"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
@@ -289,7 +446,7 @@ msgstr "Ny adressebog"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
-msgstr ""
+msgstr "Importer fra VCF"
 
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
@@ -320,23 +477,23 @@ msgstr "Slet kontaktperson"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
-msgstr ""
+msgstr "Drop foto for at uploade"
 
 #: templates/part.contact.php:29
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+msgstr "Formatter som valgfrit, fuldt navn, efternavn først eller efternavn først med komma"
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "Rediger navnedetaljer."
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "Øgenavn"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "Indtast øgenavn"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
@@ -344,19 +501,19 @@ msgstr "Fødselsdag"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "dd-mm-åååå"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "Grupper"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "Opdel gruppenavne med kommaer"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "Rediger grupper"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -364,47 +521,47 @@ msgstr "Foretrukken"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Indtast venligst en gyldig email-adresse."
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "Indtast email-adresse"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "Send mail til adresse"
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "Slet email-adresse"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "Indtast telefonnummer"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
-msgstr ""
+msgstr "Slet telefonnummer"
 
 #: templates/part.contact.php:84
 msgid "View on map"
-msgstr ""
+msgstr "Vis på kort"
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
-msgstr ""
+msgstr "Rediger adresse detaljer"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "Tilføj noter her."
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "Tilfæj element"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "Profilbillede"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -412,27 +569,31 @@ msgstr "Telefon"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "Note"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
-msgstr ""
+msgstr "Slet nuværende foto"
 
 #: templates/part.contactphoto.php:9
 msgid "Edit current photo"
-msgstr ""
+msgstr "Rediger nuværende foto"
 
 #: templates/part.contactphoto.php:10
 msgid "Upload new photo"
-msgstr ""
+msgstr "Upload nyt foto"
 
 #: templates/part.contactphoto.php:11
 msgid "Select photo from ownCloud"
+msgstr "Vælg foto fra ownCloud"
+
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
-msgstr ""
+msgstr "Rediger adresse"
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
@@ -475,7 +636,7 @@ msgstr "Land"
 
 #: templates/part.edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Rediger grupper"
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
@@ -487,79 +648,79 @@ msgstr "Adressebog"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Foranstillede titler"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Frøken"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Fru"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Hr."
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Sir"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Fru"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Fornavn"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Mellemnavne"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Efternavn"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "Efterstillede titler"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "Cand. Jur."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "M.D."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -586,82 +747,77 @@ msgid "Submit"
 msgstr "Gem"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Fortryd"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "Importer fil med kontaktpersoner"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "Vælg venligst adressebog"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "Opret ny adressebog"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
+msgstr "Navn på ny adressebog"
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Importer"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
+msgstr "Importerer kontaktpersoner"
 
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
-msgstr ""
+msgstr "Vælg hvilken adressebog, der skal importeres til:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
-msgstr ""
+msgstr "Vælg fra harddisk."
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Du har ingen kontaktpersoner i din adressebog."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Tilføj kontaktpeson."
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "Konfigurer adressebøger"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "CardDAV synkroniserings adresse"
 
 #: templates/settings.php:4
 msgid "more info"
-msgstr ""
+msgstr "mere info"
 
 #: templates/settings.php:6
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Primær adresse (Kontak m. fl.)"
 
 #: templates/settings.php:8
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 9ca4c3a10c..045cd42915 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <mikkelbjerglarsen@gmail.com>, 2011.
+#   <mikkelbjerglarsen@gmail.com>, 2011, 2012.
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
+# Thomas Tanghus <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -22,14 +23,90 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Applikationens navn ikke medsendt"
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Ingen kategori at tilføje?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Denne kategori eksisterer allerede: "
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -38,7 +115,7 @@ msgstr "Nulstil adgangskode til Owncloud"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "Nulstil ownCloud kodeord"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -103,7 +180,7 @@ msgstr "Hjælp"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Adgang forbudt"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -111,11 +188,11 @@ msgstr "Sky ikke fundet"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Rediger kategorier"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Tilføj"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -162,15 +239,15 @@ msgstr "Databasehost"
 msgid "Finish setup"
 msgstr "Afslut opsætning"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "Webtjenester under din kontrol"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Log ud"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Indstillinger"
 
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 09238a2d64..d7990d5d94 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -5,12 +5,13 @@
 # Translators:
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
+# Thomas Tanghus <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +48,67 @@ msgstr "Mangler en midlertidig mappe"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Fejl ved skrivning til disk."
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Filer"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Størrelse"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Ændret"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Filhåndtering"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -63,23 +116,23 @@ msgstr "Maksimal upload-størrelse"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "max. mulige: "
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Nødvendigt for at kunne downloade mapper og flere filer ad gangen."
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Muliggør ZIP-download"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 er ubegrænset"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Maksimal størrelse på ZIP filer"
 
 #: templates/index.php:7
 msgid "New"
@@ -95,7 +148,7 @@ msgstr "Mappe"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "Fra URL"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -103,7 +156,7 @@ msgstr "Upload"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Fortryd upload"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -115,24 +168,12 @@ msgstr "Navn"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Del"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Størrelse"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Ændret"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Slet"
@@ -149,8 +190,8 @@ msgstr "Filerne, du prøver at uploade, er større end den maksimale størrelse
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Filerne bliver indlæst, vent venligst."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Indlæser"
diff --git a/l10n/da/gallery.po b/l10n/da/gallery.po
index d9d17dc547..43c5fd2a9e 100644
--- a/l10n/da/gallery.po
+++ b/l10n/da/gallery.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <mikkelbjerglarsen@gmail.com>, 2012.
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
+# Thomas Tanghus <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -18,8 +20,48 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Billeder"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Indstillinger"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -28,15 +70,11 @@ msgstr "Genindlæs"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Stop"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Del"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -44,16 +82,16 @@ msgstr "Tilbage"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Fjern bekræftelse"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Ønsker du at fjerne albummet"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Ændre albummets navn"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Nyt album navn"
diff --git a/l10n/da/media.po b/l10n/da/media.po
index ebb2017f78..ba051b121a 100644
--- a/l10n/da/media.po
+++ b/l10n/da/media.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -19,15 +19,19 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musik"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Afspil"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pause"
 
@@ -35,7 +39,7 @@ msgstr "Pause"
 msgid "Previous"
 msgstr "Forrige"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Næste"
 
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 68c535fa05..deab93e2ed 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -7,12 +7,13 @@
 #   <mikkelbjerglarsen@gmail.com>, 2011.
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
+# Thomas Tanghus <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -22,57 +23,76 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "email ændret"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Ugyldig forespørgsel"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID ændret"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Ugyldig forespørgsel"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Sprog ændret"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Dansk"
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Mere"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Tilføj din App"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Vælg en App"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licenseret"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "af"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentation"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Håndter store filer"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -100,11 +120,11 @@ msgstr "af det tilgængelige"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Synkroniserings programmer for desktop og mobil"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Download"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -172,11 +192,11 @@ msgstr "Ny"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Standard kvote"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Andet"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/de/calendar.po b/l10n/de/calendar.po
index 863356c452..2e5af84f5a 100644
--- a/l10n/de/calendar.po
+++ b/l10n/de/calendar.po
@@ -7,13 +7,15 @@
 #   <georg.stefan.germany@googlemail.com>, 2011, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012.
+#   <peddn@web.de>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 16:43+0000\n"
-"Last-Translator: goeck <admin@s-goecker.de>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,16 +45,40 @@ msgstr "Zeitzone geändert"
 
 #: ajax/settings/settimezone.php:24
 msgid "Invalid request"
-msgstr "Anfragefehler"
+msgstr "Fehlerhafte Anfrage"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
 msgstr ""
 
 #: lib/app.php:125
@@ -153,7 +179,7 @@ msgstr "niemals"
 
 #: lib/object.php:344
 msgid "by occurrences"
-msgstr "nach Vorkommen"
+msgstr "nach Terminen"
 
 #: lib/object.php:345
 msgid "by date"
@@ -273,19 +299,19 @@ msgstr "Dezember"
 
 #: lib/object.php:418
 msgid "by events date"
-msgstr "bei Tag des Termins"
+msgstr "nach Tag des Termins"
 
 #: lib/object.php:419
 msgid "by yearday(s)"
-msgstr "an einem Tag des Jahres"
+msgstr "nach Tag des Jahres"
 
 #: lib/object.php:420
 msgid "by weeknumber(s)"
-msgstr "an einer Wochennummer"
+msgstr "nach Wochennummer"
 
 #: lib/object.php:421
 msgid "by day and month"
-msgstr "an einer Tag und Monats Kombination"
+msgstr "nach Tag und Monat"
 
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
@@ -400,7 +426,7 @@ msgstr "Löschen"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr "Von dir geteilt mit"
+msgstr "Geteilt mit dir von"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -473,7 +499,7 @@ msgstr "Kategorie"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr "Kategorien trennen mittels Komma"
+msgstr "Kategorien mit Kommas trennen"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
@@ -558,11 +584,11 @@ msgstr "Ende"
 
 #: templates/part.eventform.php:233 templates/part.showevent.php:231
 msgid "occurrences"
-msgstr "Vorkommen"
+msgstr "Termine"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr "Kalender Datei Importieren"
+msgstr "Kalenderdatei Importieren"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -614,7 +640,7 @@ msgstr "von"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "um"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -650,7 +676,7 @@ msgstr "Nutzer"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr "gewählte Nutzer"
+msgstr "Nutzer auswählen"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
@@ -662,7 +688,7 @@ msgstr "Gruppen"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr "Wähle Gruppen"
+msgstr "Gruppen auswählen"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index 3b1c71d642..067ce64126 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -5,18 +5,23 @@
 # Translators:
 #   <admin@s-goecker.de>, 2012.
 #   <fh@cbix.de>, 2012.
+#   <florian.ruechel+owncloud@gmail.com>, 2012.
 #   <georg.stefan.germany@googlemail.com>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
+# Melvin Gundlach <mail@melvin-gundlach.de>, 2012.
 # Michael Krell <m4dmike.mni@gmail.com>, 2012.
+#   <mi.sc@gmx.net>, 2012.
 #   <nelsonfritsch@gmail.com>, 2012.
+# Susi  <>, 2012.
+# Thomas Müller <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 17:10+0000\n"
-"Last-Translator: goeck <admin@s-goecker.de>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,23 +93,20 @@ msgstr "Adressbuch hinzufügen fehlgeschlagen"
 msgid "Error activating addressbook."
 msgstr "Adressbuchaktivierung fehlgeschlagen"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Es wurde keine Kontakt-ID übermittelt."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Fehler beim Laden des Bildes."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Fehler beim auslesen des Kontaktfotos."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Fehler beim Speichern der temporären Datei."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Das Kontaktfoto ist fehlerhaft."
 
@@ -128,14 +130,46 @@ msgstr "Keine Kontakt-ID angegeben."
 msgid "Missing contact id."
 msgstr "Fehlende Kontakt-ID."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Kein Foto-Pfad übermittelt."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Datei existiert nicht: "
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Fehler beim Laden des Bildes."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "Kein Name für das Element angegeben."
@@ -152,7 +186,7 @@ msgstr "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: "
 msgid "Something went FUBAR. "
 msgstr "Irgendwas ist hier so richtig schief gelaufen. "
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Kontakteigenschaft aktualisieren fehlgeschlagen"
 
@@ -168,102 +202,229 @@ msgstr "Adressbuch aktualisieren fehlgeschlagen"
 msgid "Error uploading contacts to storage."
 msgstr "Übertragen der Kontakte fehlgeschlagen"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Alles bestens, Datei erfolgreich übertragen."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Datei größer als durch die upload_max_filesize Direktive in php.ini erlaubt"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Datei größer als die MAX_FILE_SIZE Direktive erlaubt, die im HTML Formular spezifiziert ist"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Datei konnte nur teilweise übertragen werden"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Keine Datei konnte übertragen werden."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Kein temporärer Ordner vorhanden"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Zieh' eine VCF Datei hierher zum Kontaktimport"
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Adressbuch nicht gefunden."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Dies ist nicht dein Adressbuch."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontakt konnte nicht gefunden werden."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Arbeit"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Zuhause"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Anruf"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Mitteilung"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -356,7 +517,7 @@ msgstr "Gruppen"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr "Gruppen mit Komma trennen"
+msgstr "Gruppen mit Komma trennt"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
@@ -434,6 +595,10 @@ msgstr "Neues Foto hochladen"
 msgid "Select photo from ownCloud"
 msgstr "Foto aus ownCloud auswählen"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Adresse ändern"
@@ -535,35 +700,35 @@ msgstr "Höflichkeitssuffixe"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "Dr. Jur"
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "Dr. med."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "DGOM"
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "MChiro"
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Dr."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Hochwohlgeborenen"
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Senior"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -590,7 +755,7 @@ msgid "Submit"
 msgstr "Eintragen"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -618,29 +783,24 @@ msgstr "Importieren"
 msgid "Importing contacts"
 msgstr "Kontakte werden importiert"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Kontaktimport erfolgreich"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Dialog schließen"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Adressbuch importieren"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Adressbuch, in das importiert werden soll"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Zieh' eine VCF Datei hierher zum Kontaktimport"
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
-msgstr ""
+msgstr "Von der Festplatte auswählen"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
diff --git a/l10n/de/core.po b/l10n/de/core.po
index c1287e768a..2d88b3ef59 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -7,13 +7,14 @@
 #   <alex.hotz@gmail.com>, 2011.
 #   <georg.stefan.germany@googlemail.com>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 07:32+0000\n"
-"Last-Translator: goeck <admin@s-goecker.de>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,15 +28,91 @@ msgstr "Applikationsname nicht angegeben"
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr "Keine Kategorie hinzufügen?"
+msgstr "Keine Kategorie hinzuzufügen?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
 msgstr "Kategorie existiert bereits:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
-msgstr "OwnCloud Passwort zurücksetzen"
+msgstr "ownCloud Passwort zurücksetzen"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
@@ -163,15 +240,15 @@ msgstr "Datenbank-Host"
 msgid "Finish setup"
 msgstr "Installation abschließen"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Abmelden"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Einstellungen"
 
diff --git a/l10n/de/files.po b/l10n/de/files.po
index d2126f7d14..b7f6cb08c3 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -6,6 +6,7 @@
 #   <admin@s-goecker.de>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 # Michael Krell <m4dmike.mni@gmail.com>, 2012.
 #   <nelsonfritsch@gmail.com>, 2012.
 # Thomas Müller <>, 2012.
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 16:55+0000\n"
-"Last-Translator: goeck <admin@s-goecker.de>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +26,17 @@ msgstr ""
 
 #: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr "Datei hochgeladen."
+msgstr "Datei fehlerfrei hochgeladen."
 
 #: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr "Die hochgeladene Datei ist zu groß."
+msgstr "Die Größe der hochzuladenden Datei überschreitet die upload_max_filesize-Richtlinie in php.ini"
 
 #: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Die hochgeladene Datei ist zu groß."
+msgstr "Die größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde"
 
 #: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
@@ -53,17 +54,69 @@ msgstr "Temporärer Ordner fehlt."
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf Festplatte"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
-msgstr "Dateien"
+msgstr "Files"
+
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Größe"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Bearbeitet"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
 
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Dateibehandlung"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
-msgstr "Maximale Größe"
+msgstr "Maximum upload size"
 
 #: templates/admin.php:7
 msgid "max. possible: "
@@ -71,7 +124,7 @@ msgstr "maximal möglich:"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr "Für Mehrfachdateien- und Ordnerupload benötigt:"
+msgstr "Für Mehrfachdateien- und Ordnerdownloads benötigt:"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
@@ -91,7 +144,7 @@ msgstr "Neu"
 
 #: templates/index.php:9
 msgid "Text file"
-msgstr "Text Datei"
+msgstr "Textdatei"
 
 #: templates/index.php:10
 msgid "Folder"
@@ -125,18 +178,6 @@ msgstr "Teilen"
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Größe"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Bearbeitet"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Alle löschen"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Löschen"
diff --git a/l10n/de/gallery.po b/l10n/de/gallery.po
index 09a14f9b75..5015175600 100644
--- a/l10n/de/gallery.po
+++ b/l10n/de/gallery.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <admin@s-goecker.de>, 2012.
 # Bartek  <bart.p.pl@gmail.com>, 2012.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 07:29+0000\n"
-"Last-Translator: goeck <admin@s-goecker.de>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +20,53 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Bilder"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
-msgstr "Rescan"
+msgstr "Erneut Scannen"
 
 #: templates/index.php:17
 msgid "Stop"
@@ -35,10 +76,6 @@ msgstr "Stopp"
 msgid "Share"
 msgstr "Teilen"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Einstellungen"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Zurück"
diff --git a/l10n/de/media.po b/l10n/de/media.po
index 360b8b153a..4cb691b5ff 100644
--- a/l10n/de/media.po
+++ b/l10n/de/media.po
@@ -8,10 +8,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
-"Last-Translator: goeck <admin@s-goecker.de>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,15 +19,19 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musik"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Abspielen"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pause"
 
@@ -35,7 +39,7 @@ msgstr "Pause"
 msgid "Previous"
 msgstr "Vorheriges"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Nächstes"
 
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 89f3794977..f80377f656 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -6,14 +6,15 @@
 #   <admin@s-goecker.de>, 2011, 2012.
 #   <icewind1991@gmail.com>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 #   <nelsonfritsch@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 07:34+0000\n"
-"Last-Translator: goeck <admin@s-goecker.de>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,23 +23,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "E-Mail wurde geändert"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Ungültige Anfrage"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID geändert"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Ungültige Anfrage"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Sprache geändert"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Deutsch"
 
@@ -59,10 +75,14 @@ msgid "Select an App"
 msgstr "Wähle eine Anwendung aus"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-lizenziert"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "von"
 
@@ -100,7 +120,7 @@ msgstr "der verfügbaren"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr "Desktop und mobile Syncing Clienten"
+msgstr "Desktop und mobile synchronierungs Clients"
 
 #: templates/personal.php:13
 msgid "Download"
@@ -152,7 +172,7 @@ msgstr "Hilf bei der Übersetzung!"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "Benutze diese Adresse, um deine ownCloud mit deinem Dateiverwalter zu verbinden."
+msgstr "Benutze diese Adresse, um deine ownCloud mit deinem Dateimanager zu verbinden."
 
 #: templates/users.php:15 templates/users.php:44
 msgid "Name"
diff --git a/l10n/el/calendar.po b/l10n/el/calendar.po
index ae438dca15..6b6a6acedb 100644
--- a/l10n/el/calendar.po
+++ b/l10n/el/calendar.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 08:20+0000\n"
-"Last-Translator: Marios Bekatoros <>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,16 +44,40 @@ msgstr "Η ζώνη ώρας άλλαξε"
 msgid "Invalid request"
 msgstr "Μη έγκυρο αίτημα"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Ημερολόγιο"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Γενέθλια"
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index 11c4beb7b5..c5718b30c8 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -85,23 +85,20 @@ msgstr "Σφάλμα προσθήκης βιβλίου διευθύνσεων."
 msgid "Error activating addressbook."
 msgstr "Σφάλμα ενεργοποίησης βιβλίου διευθύνσεων"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Δε υπεβλήθει ID επαφής"
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Σφάλμα φόρτωσης εικόνας"
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Σφάλμα ανάγνωσης εικόνας επαφής"
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Σφάλμα αποθήκευσης προσωρινού αρχείου"
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Η φορτωμένη φωτογραφία δεν είναι έγκυρη"
 
@@ -125,14 +122,46 @@ msgstr "Λείπει ID επαφής"
 msgid "Missing contact id."
 msgstr "Απουσιαζει ID επαφής"
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Δε δόθηκε διαδρομή εικόνας"
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Το αρχείο δεν υπάρχει:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Σφάλμα φόρτωσης εικόνας"
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "δεν ορίστηκε όνομα στοιχείου"
@@ -149,7 +178,7 @@ msgstr "Οι πληροφορίες για τη vCard είναι λανθασμ
 msgid "Something went FUBAR. "
 msgstr "Κάτι χάθηκε στο άγνωστο"
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Σφάλμα ενημέρωσης ιδιότητας επαφής."
 
@@ -165,102 +194,229 @@ msgstr "Σφάλμα ενημέρωσης βιβλίου διευθύνσεων.
 msgid "Error uploading contacts to storage."
 msgstr "Σφάλμα κατά την αποθήκευση επαφών"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Δεν υπάρχει σφάλμα, το αρχείο ανέβηκε με επιτυχία "
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Το μέγεθος του αρχείου ξεπερνάει το upload_max_filesize του php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Το ανεβασμένο αρχείο υπερβαίνει το MAX_FILE_SIZE που ορίζεται στην  HTML φόρμα"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Το αρχείο ανέβηκε μερικώς"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Δεν ανέβηκε κάποιο αρχείο"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Λείπει ο προσωρινός φάκελος"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Επαφές"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Εισάγεται ένα VCF αρχείο για εισαγωγή επαφών"
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Δε βρέθηκε βιβλίο διευθύνσεων"
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Αυτό δεν είναι το βιβλίο διευθύνσεων σας."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Η επαφή δεν μπόρεσε να βρεθεί."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Τηλέφωνο"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Οργανισμός"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Εργασία"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Σπίτι"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Κινητό"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Κείμενο"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Ομιλία"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Μήνυμα "
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Φαξ"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Βίντεο"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Βομβητής"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Διαδίκτυο"
 
@@ -431,6 +587,10 @@ msgstr "Ανέβασε νέα φωτογραφία"
 msgid "Select photo from ownCloud"
 msgstr "Επέλεξε φωτογραφία από το ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Επεξεργασία διεύθυνσης"
@@ -587,7 +747,7 @@ msgid "Submit"
 msgstr "Καταχώρηση"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Ακύρωση"
 
@@ -615,27 +775,22 @@ msgstr "Εισαγωγή"
 msgid "Importing contacts"
 msgstr "Εισαγωγή επαφών"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Οι επαφές εισήχθησαν επιτυχώς"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Κλείσιμο διαλόγου"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Εισαγωγή βιβλίου διευθύνσεων"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Επέλεξε σε ποιο βιβλίο διευθύνσεων για εισαγωγή:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Εισάγεται ένα VCF αρχείο για εισαγωγή επαφών"
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Επιλογή από HD"
 
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 343b0692cd..c383ae1a88 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 16:35+0000\n"
-"Last-Translator: Marios Bekatoros <>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,6 +32,82 @@ msgstr "Δεν έχετε να προστέσθέσεται μια κα"
 msgid "This category already exists: "
 msgstr "Αυτή η κατηγορία υπάρχει ήδη"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Επανέκδοση κωδικού για το Owncloud"
@@ -162,15 +238,15 @@ msgstr "Διακομιστής βάσης δεδομένων"
 msgid "Finish setup"
 msgstr "Ολοκλήρωση εγκατάστασης"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "Υπηρεσίες web υπό τον έλεγχό σας"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Αποσύνδεση"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
diff --git a/l10n/el/files.po b/l10n/el/files.po
index c564866ebc..87cbcd3e9b 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 16:48+0000\n"
-"Last-Translator: Marios Bekatoros <>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "Λείπει ένας προσωρινός φάκελος"
 msgid "Failed to write to disk"
 msgstr "Η εγγραφή στο δίσκο απέτυχε"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Αρχεία"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Μέγεθος"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Τροποποιήθηκε"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Διαχείριση αρχείων"
@@ -121,18 +173,6 @@ msgstr "Διαμοίρασε"
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Μέγεθος"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Τροποποιήθηκε"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Διαγραφή όλων"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Διαγραφή"
diff --git a/l10n/el/gallery.po b/l10n/el/gallery.po
index 85d5d3d404..71bb2bf4bc 100644
--- a/l10n/el/gallery.po
+++ b/l10n/el/gallery.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
 # Marios Bekatoros <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 06:56+0000\n"
-"Last-Translator: Marios Bekatoros <>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,25 +20,61 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Εικόνες"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Ρυθμίσεις"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Επανασάρωση"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr "Σταμάτησε"
+msgstr "Διακοπή"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr "Κοινοποίησε"
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Ρυθμίσεις"
+msgstr "Κοινοποίηση"
 
 #: templates/view_album.php:19
 msgid "Back"
diff --git a/l10n/el/media.po b/l10n/el/media.po
index 3688478b76..4d82e044e3 100644
--- a/l10n/el/media.po
+++ b/l10n/el/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Μουσική"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Αναπαραγωγή"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Παύση"
 
@@ -34,7 +38,7 @@ msgstr "Παύση"
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Επόμενο"
 
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index f757374f53..50279c5c14 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 23:36+0000\n"
-"Last-Translator: Dimitris M. <monopatis@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,23 +23,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "το email άλλαξε"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Μη έγκυρο αίτημα"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "Το OpenID άλλαξε"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Μη έγκυρο αίτημα"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Η γλώσσα άλλαξε"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__όνομα_γλώσσας__"
 
@@ -60,10 +75,14 @@ msgid "Select an App"
 msgstr "Επιλέξτε μια εφαρμογή"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-με άδεια"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "από"
 
diff --git a/l10n/eo/calendar.po b/l10n/eo/calendar.po
index 6b95d99dfb..d01d9bb11b 100644
--- a/l10n/eo/calendar.po
+++ b/l10n/eo/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 22:05+0000\n"
-"Last-Translator: mctpyt <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,16 +42,40 @@ msgstr "La horozono estas ŝanĝita"
 msgid "Invalid request"
 msgstr "Nevalida peto"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalendaro"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d MMM[ yyyy]{ '&#8212;'d[ MMM] yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Naskiĝotago"
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index f9ab4efffb..7b4b003e48 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 22:35+0000\n"
-"Last-Translator: mctpyt <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,7 +48,7 @@ msgstr "Neniu identigilo proviziĝis."
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Eraro dum agordado de kontrolsumo."
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
@@ -82,23 +82,20 @@ msgstr "Eraro dum aldono de adresaro."
 msgid "Error activating addressbook."
 msgstr "Eraro dum aktivigo de adresaro."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Neniu kontaktidentigilo sendiĝis."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Eraro dum ŝargado de bildo."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Eraro dum lego de kontakta foto."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Eraro dum konservado de provizora dosiero."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "La alŝutata foto ne validas."
 
@@ -122,31 +119,63 @@ msgstr "Kontaktidentigilo mankas."
 msgid "Missing contact id."
 msgstr "Mankas kontaktidentigilo."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Neniu vojo al foto sendiĝis."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Dosiero ne ekzistas:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Eraro dum ŝargado de bildo."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "eronomo ne agordiĝis."
 
 #: ajax/saveproperty.php:61
 msgid "checksum is not set."
-msgstr ""
+msgstr "kontrolsumo ne agordiĝis."
 
 #: ajax/saveproperty.php:78
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:"
 
 #: ajax/saveproperty.php:83
 msgid "Something went FUBAR. "
 msgstr "Io FUBAR-is."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Eraro dum ĝisdatigo de kontaktopropraĵo."
 
@@ -162,102 +191,229 @@ msgstr "Eraro dum ĝisdatigo de adresaro."
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Ne estas eraro, la dosiero alŝutiĝis sukcese."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "la alŝutita dosiero nur parte alŝutiĝis"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Neniu dosiero alŝutiĝis."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Mankas provizora dosierujo."
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontaktoj"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Demetu VCF-dosieron por enporti kontaktojn."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Adresaro ne troviĝis."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Ĉi tiu ne estas via adresaro."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Ne eblis trovi la kontakton."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adreso"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefono"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Retpoŝtadreso"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizaĵo"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Laboro"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Hejmo"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Poŝtelefono"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Teksto"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voĉo"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Mesaĝo"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fakso"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Videaĵo"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Televokilo"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Interreto"
 
@@ -402,7 +558,7 @@ msgstr "Aldoni kampon"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "Profila bildo"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -428,6 +584,10 @@ msgstr "Alŝuti novan foton"
 msgid "Select photo from ownCloud"
 msgstr "Elekti foton el ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Redakti adreson"
@@ -485,31 +645,31 @@ msgstr "Adresaro"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Honoraj antaŭmetaĵoj"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "f-ino"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "s-ino"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "s-ro"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "s-ro"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "s-ino"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "d-ro"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
@@ -517,7 +677,7 @@ msgstr "Persona nomo"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Pliaj nomoj"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
@@ -525,7 +685,7 @@ msgstr "Familia nomo"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "Honoraj postmetaĵoj"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
@@ -584,7 +744,7 @@ msgid "Submit"
 msgstr "Sendi"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Nuligi"
 
@@ -612,54 +772,49 @@ msgstr "Enporti"
 msgid "Importing contacts"
 msgstr "Enportante kontaktojn"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Kontaktoj enportiĝis sukcese"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Fermi dialogon"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Enporti adresaron"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
-msgstr ""
+msgstr "Elektu adresaron kien enporti:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
-msgstr ""
+msgstr "Elekti el malmoldisko"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Vi ne havas kontaktojn en via adresaro"
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Aldoni kontakton"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "Agordi adresarojn"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "adresoj por CardDAV-sinkronigo"
 
 #: templates/settings.php:4
 msgid "more info"
-msgstr ""
+msgstr "pli da informo"
 
 #: templates/settings.php:6
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Ĉefa adreso (por Kontakt kaj aliaj)"
 
 #: templates/settings.php:8
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index df23dfe161..4adb4f254f 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -31,6 +31,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "La pasvorto de Owncloud estas restarigita"
@@ -161,15 +237,15 @@ msgstr "Datumbaza gastigo"
 msgid "Finish setup"
 msgstr "Fini la instalon"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "TTT-servoj sub via kontrolo"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Elsaluti"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Agordo"
 
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index e51a5621f5..70c2cce272 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 22:16+0000\n"
-"Last-Translator: mctpyt <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,10 +48,62 @@ msgstr "Mankas tempa dosierujo"
 msgid "Failed to write to disk"
 msgstr "Malsukcesis skribo al disko"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Dosieroj"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Grando"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modifita"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Dosieradministro"
@@ -120,18 +172,6 @@ msgstr "Kunhavigi"
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Grando"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modifita"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Forigi ĉion"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Forigi"
diff --git a/l10n/eo/gallery.po b/l10n/eo/gallery.po
index 97f4e281e8..df1ecedeaf 100644
--- a/l10n/eo/gallery.po
+++ b/l10n/eo/gallery.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,48 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Bildoj"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Agordo"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -29,15 +69,11 @@ msgstr "Reskani"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Halti"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Kunhavigi"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -45,16 +81,16 @@ msgstr "Antaŭen"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Forigi konfirmadon"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Ĉu vi volas forigi la albumon?"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Ŝanĝi albumnomon"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Nova albumnomo"
diff --git a/l10n/eo/media.po b/l10n/eo/media.po
index ebae5495d2..cc7a61cea5 100644
--- a/l10n/eo/media.po
+++ b/l10n/eo/media.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 13:20+0000\n"
-"Last-Translator: Michael Moroni <haikara90@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,6 +23,10 @@ msgstr ""
 msgid "Music"
 msgstr "Muziko"
 
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Ludi"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index a3cfe311be..eadd0fca66 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 22:11+0000\n"
-"Last-Translator: mctpyt <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,23 +19,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "La retpoŝtadreso estas ŝanĝita"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Nevalida peto"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "La agordo de OpenID estas ŝanĝita"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Nevalida peto"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "La lingvo estas ŝanĝita"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Esperanto"
 
@@ -56,10 +71,14 @@ msgid "Select an App"
 msgstr "Elekti aplikaĵon"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-permesila"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "de"
 
diff --git a/l10n/es/calendar.po b/l10n/es/calendar.po
index 77ae9d0ad9..4306d405f6 100644
--- a/l10n/es/calendar.po
+++ b/l10n/es/calendar.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 15:24+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,16 +45,40 @@ msgstr "Zona horaria cambiada"
 msgid "Invalid request"
 msgstr "Petición no válida"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendario"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Cumpleaños"
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index fb6ad1c86e..ec82648c8b 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -85,23 +85,20 @@ msgstr "Error al añadir la libreta de direcciones."
 msgid "Error activating addressbook."
 msgstr "Error al activar la libreta de direcciones."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "No se ha mandado ninguna ID de contacto."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Error cargando imagen."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Error leyendo fotografía del contacto."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Error al guardar archivo temporal."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "La foto que se estaba cargando no es válida."
 
@@ -125,14 +122,46 @@ msgstr "Falta la ID del contacto."
 msgid "Missing contact id."
 msgstr "Falta la id del contacto."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "No se ha introducido la ruta de la foto."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Archivo inexistente:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Error cargando imagen."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "no se ha puesto ningún nombre de elemento."
@@ -149,7 +178,7 @@ msgstr "La información sobre la vCard es incorrecta. Por favor, recarga la pág
 msgid "Something went FUBAR. "
 msgstr "Plof. Algo ha fallado."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Error al actualizar una propiedad del contacto."
 
@@ -165,102 +194,229 @@ msgstr "Error al actualizar la libreta de direcciones."
 msgid "Error uploading contacts to storage."
 msgstr "Error al subir contactos al almacenamiento."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "No hay ningún error, el archivo se ha subido con éxito"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "El archivo subido sobrepasa la directiva upload_max_filesize de php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El archivo subido sobrepasa la directiva MAX_FILE_SIZE especificada en el formulario HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "El archivo se ha subido parcialmente"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "No se ha subido ningún archivo"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Falta la carpeta temporal"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contactos"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Suelta un archivo VCF para importar contactos."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Libreta de direcciones no encontrada."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Esta no es tu agenda de contactos."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "No se ha podido encontrar el contacto."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Dirección"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organización"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Trabajo"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Particular"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Móvil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Mensaje"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Localizador"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -431,6 +587,10 @@ msgstr "Subir nueva fotografía"
 msgid "Select photo from ownCloud"
 msgstr "Seleccionar fotografía desde ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Editar dirección"
@@ -587,7 +747,7 @@ msgid "Submit"
 msgstr "Aceptar"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -615,27 +775,22 @@ msgstr "Importar"
 msgid "Importing contacts"
 msgstr "Importando contactos"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Contactos importados correctamente"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Cerrar Diálogo"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Importar agenda"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Selecciona una agenda para importar a:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Suelta un archivo VCF para importar contactos."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Seleccionar del disco duro"
 
diff --git a/l10n/es/core.po b/l10n/es/core.po
index e5c8d5775b..1e802ebc93 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 15:32+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,6 +34,82 @@ msgstr "¿Ninguna categoría para agregar?"
 msgid "This category already exists: "
 msgstr "Esta categoría ya existe: "
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Restablecer contraseña de ownCloud"
@@ -164,15 +240,15 @@ msgstr "Host de la base de datos"
 msgid "Finish setup"
 msgstr "Completar la instalación"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "servicios web bajo tu control"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Salir"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Ajustes"
 
diff --git a/l10n/es/files.po b/l10n/es/files.po
index dbedafbf25..4e4b0b0c2d 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 15:34+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "Falta un directorio temporal"
 msgid "Failed to write to disk"
 msgstr "La escritura en disco ha fallado"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Archivos"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Tamaño"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modificado"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Tratamiento de archivos"
@@ -121,18 +173,6 @@ msgstr "Compartir"
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Tamaño"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modificado"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Eliminar todo"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Eliminado"
diff --git a/l10n/es/gallery.po b/l10n/es/gallery.po
index 9486008860..94068028c6 100644
--- a/l10n/es/gallery.po
+++ b/l10n/es/gallery.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 15:29+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,10 +20,50 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Imágenes"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Preferencias"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Refrescar"
@@ -36,10 +76,6 @@ msgstr "Parar"
 msgid "Share"
 msgstr "Compartir"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Preferencias"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Atrás"
diff --git a/l10n/es/media.po b/l10n/es/media.po
index eedcf2da4b..d1c84d0e8b 100644
--- a/l10n/es/media.po
+++ b/l10n/es/media.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 15:21+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,6 +23,10 @@ msgstr ""
 msgid "Music"
 msgstr "Música"
 
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Reproducir"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 225a2169d7..a8cb655556 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 15:30+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,23 +24,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "correo electrónico actualizado"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Solicitud no válida"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID cambiado"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Solicitud no válida"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Idioma cambiado"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Castellano"
 
@@ -61,10 +76,14 @@ msgid "Select an App"
 msgstr "Seleccionar una aplicación"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-autorizado"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "por"
 
diff --git a/l10n/et_EE/calendar.po b/l10n/et_EE/calendar.po
index 5fd1bfb92f..2cca9be319 100644
--- a/l10n/et_EE/calendar.po
+++ b/l10n/et_EE/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 14:56+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,16 +42,40 @@ msgstr "Ajavöönd on muudetud"
 msgid "Invalid request"
 msgstr "Vigane päring"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Sünnipäev"
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index a93421ea9a..c78d9e4307 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -82,23 +82,20 @@ msgstr "Viga aadressiraamatu lisamisel."
 msgid "Error activating addressbook."
 msgstr "Viga aadressiraamatu aktiveerimisel."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Kontakti ID-d pole sisestatud."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Viga pildi laadimisel."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Viga kontakti foto lugemisel."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Viga ajutise faili salvestamisel."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Laetav pilt pole korrektne pildifail."
 
@@ -122,14 +119,46 @@ msgstr "Kontakti ID puudub."
 msgid "Missing contact id."
 msgstr "Puuduv kontakti ID."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Foto asukohta pole määratud."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Faili pole olemas:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Viga pildi laadimisel."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "elemendi nime pole määratud."
@@ -146,7 +175,7 @@ msgstr "vCard info pole korrektne. Palun lae lehekülg uuesti: "
 msgid "Something went FUBAR. "
 msgstr "Midagi läks tõsiselt metsa."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Viga konktaki korralikul uuendamisel."
 
@@ -162,102 +191,229 @@ msgstr "Viga aadressiraamatu uuendamisel."
 msgid "Error uploading contacts to storage."
 msgstr "Viga kontaktide üleslaadimisel kettale."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Ühtegi tõrget polnud, fail on üles laetud"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Üleslaetud fail ületab php.ini failis määratud upload_max_filesize suuruse"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fail laeti üles ainult osaliselt"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Ühtegi faili ei laetud üles"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Ajutiste failide kaust puudub"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontaktid"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Lohista siia VCF-fail, millest kontakte importida."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Aadressiraamatut ei leitud"
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "See pole sinu aadressiraamat."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontakti ei leitud."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Aadress"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organisatsioon"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Töö"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Kodu"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobiil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Hääl"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Sõnum"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Piipar"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -428,6 +584,10 @@ msgstr "Lae üles uus foto"
 msgid "Select photo from ownCloud"
 msgstr "Vali foto ownCloudist"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Muuda aadressi"
@@ -584,7 +744,7 @@ msgid "Submit"
 msgstr "Saada"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Loobu"
 
@@ -612,27 +772,22 @@ msgstr "Impordi"
 msgid "Importing contacts"
 msgstr "Kontaktide importimine"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Kontaktid on imporditud"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Sulge dialoog"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Impordi aadressiraamat"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Vali aadressiraamat, millesse importida:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Lohista siia VCF-fail, millest kontakte importida."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Vali kõvakettalt"
 
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 9b5a48bbe2..7ef4059934 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 14:53+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,6 +30,82 @@ msgstr "Pole kategooriat, mida lisada?"
 msgid "This category already exists: "
 msgstr "See kategooria on juba olemas: "
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Owncloud parooli taastamine"
@@ -160,15 +236,15 @@ msgstr "Andmebaasi host"
 msgid "Finish setup"
 msgstr "Lõpeta seadistamine"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "veebiteenused sinu kontrolli all"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Logi välja"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Seaded"
 
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 6045145acd..8e2e2f4090 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 15:03+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,10 +48,62 @@ msgstr "Ajutiste failide kaust puudub"
 msgid "Failed to write to disk"
 msgstr "Kettale kirjutamine ebaõnnestus"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Failid"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Suurus"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Muudetud"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Failide käsitlemine"
@@ -120,18 +172,6 @@ msgstr "Jaga"
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Suurus"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Muudetud"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Kustuta kõik"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Kustuta"
diff --git a/l10n/et_EE/gallery.po b/l10n/et_EE/gallery.po
index 93abfcda3a..1b844f2ca9 100644
--- a/l10n/et_EE/gallery.po
+++ b/l10n/et_EE/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 14:59+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Pildid"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Seaded"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Skänni uuesti"
@@ -34,10 +74,6 @@ msgstr "Peata"
 msgid "Share"
 msgstr "Jaga"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Seaded"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Tagasi"
diff --git a/l10n/et_EE/media.po b/l10n/et_EE/media.po
index 3591a13cae..8be81b35e4 100644
--- a/l10n/et_EE/media.po
+++ b/l10n/et_EE/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Muusika"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Esita"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Paus"
 
@@ -34,7 +38,7 @@ msgstr "Paus"
 msgid "Previous"
 msgstr "Eelmine"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Järgmine"
 
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index ff5dc06701..6b303c8c23 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 14:57+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,23 +20,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "e-posti on muudetud"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Vigane päring"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID on muudetud"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Vigane päring"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Keel on muudetud"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Eesti"
 
@@ -57,10 +72,14 @@ msgid "Select an App"
 msgstr "Vali programm"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-litsenseeritud"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "kelle poolt"
 
diff --git a/l10n/eu/calendar.po b/l10n/eu/calendar.po
index 3ba3f9b004..15d3461f55 100644
--- a/l10n/eu/calendar.po
+++ b/l10n/eu/calendar.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 10:07+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,16 +44,40 @@ msgstr "Ordu-zonaldea aldatuta"
 msgid "Invalid request"
 msgstr "Baliogabeko eskaera"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Egutegia"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Jaioteguna"
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index eaf9bc62e4..1009fa2d06 100644
--- a/l10n/eu/contacts.po
+++ b/l10n/eu/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 09:58+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,23 +84,20 @@ msgstr "Errore bat egon da helbide liburua gehitzean."
 msgid "Error activating addressbook."
 msgstr "Errore bat egon da helbide-liburua aktibatzen."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Errore bat izan da irudia kargatzearkoan."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Errore bat izan da kontaktuaren argazkia igotzerakoan."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Kargatzen ari den argazkia ez da egokia."
 
@@ -124,14 +121,46 @@ msgstr "Kontaktuaren IDa falta da."
 msgid "Missing contact id."
 msgstr "Kontaktuaren IDa falta da."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Fitxategia ez da existitzen:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Errore bat izan da irudia kargatzearkoan."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "elementuaren izena ez da ezarri."
@@ -148,7 +177,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Errorea kontaktu propietatea eguneratzean."
 
@@ -164,102 +193,229 @@ msgstr "Errore bat egon da helbide liburua eguneratzen."
 msgid "Error uploading contacts to storage."
 msgstr "Errore bat egon da kontaktuak biltegira igotzerakoan."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Ez da errorerik egon, fitxategia ongi igo da"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Igotako fitxategiaren zati bat bakarrik igo da"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Ez da fitxategirik igo"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontaktuak"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Askatu VCF fitxategia kontaktuak inportatzeko."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Helbide liburua ez da aurkitu"
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Hau ez da zure helbide liburua."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Ezin izan da kontaktua aurkitu."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Helbidea"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefonoa"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Eposta"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Erakundea"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Lana"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Etxea"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mugikorra"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Testua"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Ahotsa"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Mezua"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax-a"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Bideoa"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Bilagailua"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -430,6 +586,10 @@ msgstr "Igo argazki berria"
 msgid "Select photo from ownCloud"
 msgstr "Hautatu argazki bat ownCloudetik"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Editatu helbidea"
@@ -586,7 +746,7 @@ msgid "Submit"
 msgstr "Bidali"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Ezeztatu"
 
@@ -614,27 +774,22 @@ msgstr "Inportatu"
 msgid "Importing contacts"
 msgstr "Kontaktuak inportatzen"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Kontaktuak ongi inportatu dira"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Dialogoa itxi"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Inporatu helbide liburua"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Hautau helburuko helbide liburua:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Askatu VCF fitxategia kontaktuak inportatzeko."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Hautatu disko gogorretik"
 
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 35e7f5afb6..070d14864c 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 09:40+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,6 +31,82 @@ msgstr "Ez dago gehitzeko kategoriarik?"
 msgid "This category already exists: "
 msgstr "Kategoria hau dagoeneko existitzen da:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Owncloudeko pasahitza berrezarri"
@@ -161,15 +237,15 @@ msgstr "Datubasearen hostalaria"
 msgid "Finish setup"
 msgstr "Bukatu konfigurazioa"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "web zerbitzuak zure kontrolpean"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Saioa bukatu"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Ezarpenak"
 
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 04dbf77f53..28b55a998c 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 09:42+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "Aldi baterako karpeta falta da"
 msgid "Failed to write to disk"
 msgstr "Errore bat izan da diskoan idazterakoan"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Fitxategiak"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Tamaina"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Aldatuta"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Fitxategien kudeaketa"
@@ -121,18 +173,6 @@ msgstr "Elkarbanatu"
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Tamaina"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Aldatuta"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Ezabatu dena"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Ezabatu"
diff --git a/l10n/eu/gallery.po b/l10n/eu/gallery.po
index 3f8cf59267..e9794f69fa 100644
--- a/l10n/eu/gallery.po
+++ b/l10n/eu/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 09:59+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Argazkiak"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Ezarpenak"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Bireskaneatu"
@@ -34,10 +74,6 @@ msgstr "Gelditu"
 msgid "Share"
 msgstr "Elkarbanatu"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Ezarpenak"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Atzera"
diff --git a/l10n/eu/media.po b/l10n/eu/media.po
index c70fbc6fa1..468d2fba32 100644
--- a/l10n/eu/media.po
+++ b/l10n/eu/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musika"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Erreproduzitu"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pausarazi"
 
@@ -34,7 +38,7 @@ msgstr "Pausarazi"
 msgid "Previous"
 msgstr "Aurrekoa"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Hurrengoa"
 
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 3982dd46b3..cca5da2a9c 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 09:44+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,23 +21,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "e-posta aldatuta"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Baliogabeko eskaria"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID aldatuta"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Baliogabeko eskaria"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Hizkuntza aldatuta"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Euskera"
 
@@ -58,10 +73,14 @@ msgid "Select an App"
 msgstr "Aukeratu programa bat"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "lizentziarekin"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr " Egilea:"
 
diff --git a/l10n/fa/calendar.po b/l10n/fa/calendar.po
index 6dbb4fdd41..36e72a9262 100644
--- a/l10n/fa/calendar.po
+++ b/l10n/fa/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 17:11+0000\n"
-"Last-Translator: Hossein nag <h.sname@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,16 +42,40 @@ msgstr "زمان محلی تغییر یافت"
 msgid "Invalid request"
 msgstr "درخواست نامعتبر"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "تقویم"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "DDD m[ yyyy]{ '&#8212;'[ DDD] m yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "روزتولد"
diff --git a/l10n/fa/contacts.po b/l10n/fa/contacts.po
index 288ff30380..15075e66e4 100644
--- a/l10n/fa/contacts.po
+++ b/l10n/fa/contacts.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 17:44+0000\n"
-"Last-Translator: Hossein nag <h.sname@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,23 +82,20 @@ msgstr "خطا درهنگام افزودن کتابچه نشانی ها"
 msgid "Error activating addressbook."
 msgstr "خطا درهنگام فعال سازیکتابچه نشانی ها"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "هیچ اطلاعاتی راجع به شناسه ارسال نشده"
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "خطا در بارگزاری تصویر"
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "خطا در خواندن اطلاعات تصویر"
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "خطا در ذخیره پرونده موقت"
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "بارگزاری تصویر امکان پذیر نیست"
 
@@ -122,14 +119,46 @@ msgstr "اطلاعات شناسه گم شده"
 msgid "Missing contact id."
 msgstr "شما اطلاعات شناسه را فراموش کرده اید"
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "هیچ نشانی از تصویرارسال نشده"
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "پرونده وجود ندارد"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "خطا در بارگزاری تصویر"
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "نام اصلی تنظیم نشده است"
@@ -146,7 +175,7 @@ msgstr "اطلاعات کارت ویزا شما غلط است لطفا صفحه
 msgid "Something went FUBAR. "
 msgstr "چند چیز به FUBAR رفتند"
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "خطا در هنگام بروزرسانی  اطلاعات شخص مورد نظر"
 
@@ -162,102 +191,229 @@ msgstr "خطا در هنگام بروزرسانی کتابچه نشانی ها"
 msgid "Error uploading contacts to storage."
 msgstr "خطا در هنگام بارگذاری و ذخیره سازی"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "هیچ خطایی نیست بارگذاری پرونده موفقیت آمیز بود"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "حجم آپلود از طریق Php.ini تعیین می شود"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "حداکثر حجم قابل بار گذاری از طریق HTML MAX_FILE_SIZE است"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "پرونده بارگذاری شده فقط تاحدودی بارگذاری شده"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "هیچ پروندهای بارگذاری نشده"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "یک پوشه موقت گم شده"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "اشخاص"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "یک پرونده VCF را به اینجا بکشید تا اشخاص افزوده شوند"
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "کتابچه نشانی ها یافت نشد"
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "این کتابچه ی نشانه های شما نیست"
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "اتصال ویا تماسی یافت نشد"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "نشانی"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "تلفن"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "نشانی پست الکترنیک"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "نهاد(ارگان)"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "کار"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "خانه"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "موبایل"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "متن"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "صدا"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "پیغام"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "دورنگار:"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "رسانه تصویری"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "صفحه"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "اینترنت"
 
@@ -428,6 +584,10 @@ msgstr "بار گذاری یک تصویر جدید"
 msgid "Select photo from ownCloud"
 msgstr "انتخاب یک تصویر از ابر های شما"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "ویرایش نشانی"
@@ -584,7 +744,7 @@ msgid "Submit"
 msgstr "ارسال"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "انصراف"
 
@@ -612,27 +772,22 @@ msgstr "وارد کردن"
 msgid "Importing contacts"
 msgstr "وارد کردن اشخاص"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "اشخاص با موفقیت افزوده شدند"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "بستن دیالوگ"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "وارد کردن کتابچه نشانی"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "یک کتابچه نشانی انتخاب کنید تا وارد شود"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "یک پرونده VCF را به اینجا بکشید تا اشخاص افزوده شوند"
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "انتخاب از دیسک سخت"
 
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index ab6eb385a8..6930fb647c 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 14:05+0000\n"
-"Last-Translator: Hossein nag <h.sname@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,6 +30,82 @@ msgstr "آیا گروه دیگری برای افزودن ندارید"
 msgid "This category already exists: "
 msgstr "این گروه از قبل اضافه شده"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "گذرواژه ابرهای شما تغییرکرد"
@@ -160,15 +236,15 @@ msgstr "هاست پایگاه داده"
 msgid "Finish setup"
 msgstr "اتمام نصب"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "سرویس وب تحت کنترل شما"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "خروج"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "تنظیمات"
 
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 3de912cfea..b58f617676 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 14:23+0000\n"
-"Last-Translator: Hossein nag <h.sname@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,10 +48,62 @@ msgstr "یک پوشه موقت گم شده است"
 msgid "Failed to write to disk"
 msgstr "نوشتن بر روی دیسک سخت ناموفق بود"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "فایل ها"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "اندازه"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "تغییر یافته"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "اداره پرونده ها"
@@ -120,18 +172,6 @@ msgstr "به اشتراک گذاری"
 msgid "Download"
 msgstr "بارگیری"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "اندازه"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "تغییر یافته"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "پاک کردن همه"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "پاک کردن"
diff --git a/l10n/fa/gallery.po b/l10n/fa/gallery.po
index 0377100229..72ce435195 100644
--- a/l10n/fa/gallery.po
+++ b/l10n/fa/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 16:59+0000\n"
-"Last-Translator: Hossein nag <h.sname@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "تصاویر"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "تنظیمات"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "بازرسی دوباره"
@@ -34,10 +74,6 @@ msgstr "توقف"
 msgid "Share"
 msgstr "به اشتراک گذاری"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "تنظیمات"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "بازگشت"
diff --git a/l10n/fa/media.po b/l10n/fa/media.po
index af18cfd0cc..bd920337ba 100644
--- a/l10n/fa/media.po
+++ b/l10n/fa/media.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 14:28+0000\n"
-"Last-Translator: Hossein nag <h.sname@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +22,10 @@ msgstr ""
 msgid "Music"
 msgstr "موسیقی"
 
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "پخش کردن"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index e75bed6f8e..1ee3d62cdb 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 15:00+0000\n"
-"Last-Translator: Hossein nag <h.sname@yahoo.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,23 +19,38 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "پست الکترونیکی تغییر کرد"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "درخواست غیر قابل قبول"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID تغییر کرد"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "درخواست غیر قابل قبول"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "زبان تغییر کرد"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -56,10 +71,14 @@ msgid "Select an App"
 msgstr "یک برنامه انتخاب کنید"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "مجوزنامه"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "به وسیله"
 
diff --git a/l10n/fi_FI/calendar.po b/l10n/fi_FI/calendar.po
index fd1a9967ec..17475e37a0 100644
--- a/l10n/fi_FI/calendar.po
+++ b/l10n/fi_FI/calendar.po
@@ -3,12 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
+# Johannes Korpela <>, 2012.
+#   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -19,133 +22,157 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Kalentereita ei löytynyt"
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Tapahtumia ei löytynyt."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
-msgstr ""
+msgstr "Väärä kalenteri"
 
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
-msgstr ""
+msgstr "Uusi aikavyöhyke:"
 
 #: ajax/settings/settimezone.php:22
 msgid "Timezone changed"
-msgstr ""
+msgstr "Aikavyöhyke vaihdettu"
 
 #: ajax/settings/settimezone.php:24
 msgid "Invalid request"
-msgstr ""
+msgstr "Virheellinen pyyntö"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
+msgstr "Kalenteri"
+
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: js/calendar.js:788
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
-msgid "Birthday"
-msgstr ""
-
-#: lib/app.php:123
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:124
-msgid "Call"
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
 msgstr ""
 
 #: lib/app.php:125
-msgid "Clients"
-msgstr ""
+msgid "Birthday"
+msgstr "Syntymäpäivä"
 
 #: lib/app.php:126
-msgid "Deliverer"
+msgid "Business"
 msgstr ""
 
 #: lib/app.php:127
-msgid "Holidays"
-msgstr ""
+msgid "Call"
+msgstr "Ota yhteyttä"
 
 #: lib/app.php:128
-msgid "Ideas"
-msgstr ""
+msgid "Clients"
+msgstr "Asiakkaat"
 
 #: lib/app.php:129
-msgid "Journey"
-msgstr ""
+msgid "Deliverer"
+msgstr "Toimittaja"
 
 #: lib/app.php:130
-msgid "Jubilee"
-msgstr ""
+msgid "Holidays"
+msgstr "Vapaapäivät"
 
 #: lib/app.php:131
-msgid "Meeting"
-msgstr ""
+msgid "Ideas"
+msgstr "Ideat"
 
 #: lib/app.php:132
-msgid "Other"
-msgstr ""
+msgid "Journey"
+msgstr "Matkustus"
 
 #: lib/app.php:133
-msgid "Personal"
-msgstr ""
+msgid "Jubilee"
+msgstr "Vuosipäivät"
 
 #: lib/app.php:134
-msgid "Projects"
-msgstr ""
+msgid "Meeting"
+msgstr "Tapaamiset"
 
 #: lib/app.php:135
-msgid "Questions"
-msgstr ""
+msgid "Other"
+msgstr "Muut"
 
 #: lib/app.php:136
-msgid "Work"
-msgstr ""
+msgid "Personal"
+msgstr "Henkilökohtainen"
 
-#: lib/app.php:377
+#: lib/app.php:137
+msgid "Projects"
+msgstr "Projektit"
+
+#: lib/app.php:138
+msgid "Questions"
+msgstr "Kysymykset"
+
+#: lib/app.php:139
+msgid "Work"
+msgstr "Työ"
+
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "nimetön"
 
 #: lib/object.php:330
 msgid "Does not repeat"
-msgstr ""
+msgstr "Ei toistoa"
 
 #: lib/object.php:331
 msgid "Daily"
-msgstr ""
+msgstr "Päivittäin"
 
 #: lib/object.php:332
 msgid "Weekly"
-msgstr ""
+msgstr "Viikottain"
 
 #: lib/object.php:333
 msgid "Every Weekday"
-msgstr ""
+msgstr "Arkipäivisin"
 
 #: lib/object.php:334
 msgid "Bi-Weekly"
-msgstr ""
+msgstr "Joka toinen viikko"
 
 #: lib/object.php:335
 msgid "Monthly"
-msgstr ""
+msgstr "Kuukausittain"
 
 #: lib/object.php:336
 msgid "Yearly"
-msgstr ""
+msgstr "Vuosittain"
 
 #: lib/object.php:343
 msgid "never"
-msgstr ""
+msgstr "Ei koskaan"
 
 #: lib/object.php:344
 msgid "by occurrences"
@@ -165,31 +192,31 @@ msgstr ""
 
 #: lib/object.php:360 templates/settings.php:42
 msgid "Monday"
-msgstr ""
+msgstr "Maanantai"
 
 #: lib/object.php:361
 msgid "Tuesday"
-msgstr ""
+msgstr "Tiistai"
 
 #: lib/object.php:362
 msgid "Wednesday"
-msgstr ""
+msgstr "Keskiviikko"
 
 #: lib/object.php:363
 msgid "Thursday"
-msgstr ""
+msgstr "Torstai"
 
 #: lib/object.php:364
 msgid "Friday"
-msgstr ""
+msgstr "Perjantai"
 
 #: lib/object.php:365
 msgid "Saturday"
-msgstr ""
+msgstr "Lauantai"
 
 #: lib/object.php:366 templates/settings.php:43
 msgid "Sunday"
-msgstr ""
+msgstr "Sunnuntai"
 
 #: lib/object.php:373
 msgid "events week of month"
@@ -197,75 +224,75 @@ msgstr ""
 
 #: lib/object.php:374
 msgid "first"
-msgstr ""
+msgstr "ensimmäinen"
 
 #: lib/object.php:375
 msgid "second"
-msgstr ""
+msgstr "toinen"
 
 #: lib/object.php:376
 msgid "third"
-msgstr ""
+msgstr "kolmas"
 
 #: lib/object.php:377
 msgid "fourth"
-msgstr ""
+msgstr "neljäs"
 
 #: lib/object.php:378
 msgid "fifth"
-msgstr ""
+msgstr "viides"
 
 #: lib/object.php:379
 msgid "last"
-msgstr ""
+msgstr "viimeinen"
 
 #: lib/object.php:401
 msgid "January"
-msgstr ""
+msgstr "Tammikuu"
 
 #: lib/object.php:402
 msgid "February"
-msgstr ""
+msgstr "Helmikuu"
 
 #: lib/object.php:403
 msgid "March"
-msgstr ""
+msgstr "Maaliskuu"
 
 #: lib/object.php:404
 msgid "April"
-msgstr ""
+msgstr "Huhtikuu"
 
 #: lib/object.php:405
 msgid "May"
-msgstr ""
+msgstr "Toukokuu"
 
 #: lib/object.php:406
 msgid "June"
-msgstr ""
+msgstr "Kesäkuu"
 
 #: lib/object.php:407
 msgid "July"
-msgstr ""
+msgstr "Heinäkuu"
 
 #: lib/object.php:408
 msgid "August"
-msgstr ""
+msgstr "Elokuu"
 
 #: lib/object.php:409
 msgid "September"
-msgstr ""
+msgstr "Syyskuu"
 
 #: lib/object.php:410
 msgid "October"
-msgstr ""
+msgstr "Lokakuu"
 
 #: lib/object.php:411
 msgid "November"
-msgstr ""
+msgstr "Marraskuu"
 
 #: lib/object.php:412
 msgid "December"
-msgstr ""
+msgstr "Joulukuu"
 
 #: lib/object.php:418
 msgid "by events date"
@@ -285,7 +312,7 @@ msgstr ""
 
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
-msgstr ""
+msgstr "Päivämäärä"
 
 #: lib/search.php:40
 msgid "Cal."
@@ -293,20 +320,20 @@ msgstr ""
 
 #: templates/calendar.php:11
 msgid "All day"
-msgstr ""
+msgstr "Koko päivä"
 
 #: templates/calendar.php:12 templates/part.choosecalendar.php:22
 msgid "New Calendar"
-msgstr ""
+msgstr "Uusi kalenteri"
 
 #: templates/calendar.php:13
 msgid "Missing fields"
-msgstr ""
+msgstr "Puuttuvat kentät"
 
 #: templates/calendar.php:14 templates/part.eventform.php:19
 #: templates/part.showevent.php:11
 msgid "Title"
-msgstr ""
+msgstr "Otsikko"
 
 #: templates/calendar.php:16
 msgid "From Date"
@@ -326,190 +353,190 @@ msgstr ""
 
 #: templates/calendar.php:20
 msgid "The event ends before it starts"
-msgstr ""
+msgstr "Tapahtuma päättyy ennen alkamistaan"
 
 #: templates/calendar.php:21
 msgid "There was a database fail"
-msgstr ""
+msgstr "Tapahtui tietokantavirhe"
 
 #: templates/calendar.php:40
 msgid "Week"
-msgstr ""
+msgstr "Viikko"
 
 #: templates/calendar.php:41
 msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
 
 #: templates/calendar.php:42
 msgid "List"
-msgstr ""
+msgstr "Lista"
 
 #: templates/calendar.php:48
 msgid "Today"
-msgstr ""
+msgstr "Tänään"
 
 #: templates/calendar.php:49
 msgid "Calendars"
-msgstr ""
+msgstr "Kalenterit"
 
 #: templates/calendar.php:67
 msgid "There was a fail, while parsing the file."
-msgstr ""
+msgstr "Tiedostoa jäsennettäessä tapahtui virhe."
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
-msgstr ""
+msgstr "Valitse aktiiviset kalenterit"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Omat kalenterisi"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
 msgid "CalDav Link"
-msgstr ""
+msgstr "CalDav-linkki"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Jaetut kalenterit"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Ei jaettuja kalentereita"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Jaa kalenteri"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
-msgstr ""
+msgstr "Lataa"
 
 #: templates/part.choosecalendar.rowfields.php:7
 msgid "Edit"
-msgstr ""
+msgstr "Muokkaa"
 
 #: templates/part.choosecalendar.rowfields.php:8
 #: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Poista"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "kanssasi jaettu"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr ""
+msgstr "Uusi kalenteri"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
-msgstr ""
+msgstr "Muokkaa kalenteria"
 
 #: templates/part.editcalendar.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Kalenterin nimi"
 
 #: templates/part.editcalendar.php:23
 msgid "Active"
-msgstr ""
+msgstr "Aktiivinen"
 
 #: templates/part.editcalendar.php:29
 msgid "Calendar color"
-msgstr ""
+msgstr "Kalenterin väri"
 
 #: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "Tallenna"
 
 #: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Talleta"
 
 #: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr "Peru"
 
 #: templates/part.editevent.php:1
 msgid "Edit an event"
-msgstr ""
+msgstr "Muokkaa tapahtumaa"
 
 #: templates/part.editevent.php:10
 msgid "Export"
-msgstr ""
+msgstr "Vie"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Tapahtumatiedot"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Toisto"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Hälytys"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Osallistujat"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Jaa"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
-msgstr ""
+msgstr "Tapahtuman otsikko"
 
 #: templates/part.eventform.php:27 templates/part.showevent.php:19
 msgid "Category"
-msgstr ""
+msgstr "Luokka"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Erota luokat pilkuilla"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Muokkaa luokkia"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
-msgstr ""
+msgstr "Koko päivän tapahtuma"
 
 #: templates/part.eventform.php:60 templates/part.showevent.php:59
 msgid "From"
-msgstr ""
+msgstr "Alkaa"
 
 #: templates/part.eventform.php:68 templates/part.showevent.php:67
 msgid "To"
-msgstr ""
+msgstr "Päättyy"
 
 #: templates/part.eventform.php:76 templates/part.showevent.php:75
 msgid "Advanced options"
-msgstr ""
+msgstr "Tarkemmat asetukset"
 
 #: templates/part.eventform.php:81 templates/part.showevent.php:80
 msgid "Location"
-msgstr ""
+msgstr "Sijainti"
 
 #: templates/part.eventform.php:83
 msgid "Location of the Event"
-msgstr ""
+msgstr "Tapahtuman sijainti"
 
 #: templates/part.eventform.php:89 templates/part.showevent.php:88
 msgid "Description"
-msgstr ""
+msgstr "Kuvaus"
 
 #: templates/part.eventform.php:91
 msgid "Description of the Event"
-msgstr ""
+msgstr "Tapahtuman kuvaus"
 
 #: templates/part.eventform.php:100 templates/part.showevent.php:98
 msgid "Repeat"
-msgstr ""
+msgstr "Toisto"
 
 #: templates/part.eventform.php:107 templates/part.showevent.php:105
 msgid "Advanced"
@@ -517,12 +544,12 @@ msgstr ""
 
 #: templates/part.eventform.php:151 templates/part.showevent.php:149
 msgid "Select weekdays"
-msgstr ""
+msgstr "Valitse viikonpäivät"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
 #: templates/part.showevent.php:162 templates/part.showevent.php:175
 msgid "Select days"
-msgstr ""
+msgstr "Valitse päivät"
 
 #: templates/part.eventform.php:169 templates/part.showevent.php:167
 msgid "and the events day of year."
@@ -534,11 +561,11 @@ msgstr ""
 
 #: templates/part.eventform.php:190 templates/part.showevent.php:188
 msgid "Select months"
-msgstr ""
+msgstr "Valitse kuukaudet"
 
 #: templates/part.eventform.php:203 templates/part.showevent.php:201
 msgid "Select weeks"
-msgstr ""
+msgstr "Valitse viikot"
 
 #: templates/part.eventform.php:208 templates/part.showevent.php:206
 msgid "and the events week of year."
@@ -546,7 +573,7 @@ msgstr ""
 
 #: templates/part.eventform.php:214 templates/part.showevent.php:212
 msgid "Interval"
-msgstr ""
+msgstr "Intervalli"
 
 #: templates/part.eventform.php:220 templates/part.showevent.php:218
 msgid "End"
@@ -558,51 +585,51 @@ msgstr ""
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Tuo kalenteritiedosto"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
-msgstr ""
+msgstr "Valitse kalenteri"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "luo uusi kalenteri"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Uuden kalenterin nimi"
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Tuo"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Tuodaan kalenteria"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Kalenteri tuotu onnistuneesti"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Sulje ikkuna"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
-msgstr ""
+msgstr "Luo uusi tapahtuma"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Avaa tapahtuma"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "Luokkia ei ole valittu"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
-msgstr ""
+msgstr "Valitse luokka"
 
 #: templates/part.showevent.php:37
 msgid "of"
@@ -614,52 +641,52 @@ msgstr ""
 
 #: templates/settings.php:14
 msgid "Timezone"
-msgstr ""
+msgstr "Aikavyöhyke"
 
 #: templates/settings.php:31
 msgid "Check always for changes of the timezone"
-msgstr ""
+msgstr "Tarkista aina aikavyöhykkeen muutokset"
 
 #: templates/settings.php:33
 msgid "Timeformat"
-msgstr ""
+msgstr "Ajan esitysmuoto"
 
 #: templates/settings.php:35
 msgid "24h"
-msgstr ""
+msgstr "24 tuntia"
 
 #: templates/settings.php:36
 msgid "12h"
-msgstr ""
+msgstr "12 tuntia"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "Viikon ensimmäinen päivä"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
-msgstr ""
+msgstr "Kalenterin CalDAV-synkronointiosoite:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Käyttäjät"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "valitse käyttäjät"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Muoktattava"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Ryhmät"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "valitse ryhmät"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "aseta julkiseksi"
diff --git a/l10n/fi_FI/contacts.po b/l10n/fi_FI/contacts.po
index 8dbd3939d8..4748623176 100644
--- a/l10n/fi_FI/contacts.po
+++ b/l10n/fi_FI/contacts.po
@@ -3,12 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jesse Jaara <jesse.jaara@gmail.com>, 2012.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
+# Johannes Korpela <>, 2012.
+#   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -23,15 +27,15 @@ msgstr ""
 
 #: ajax/addcontact.php:59
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "Virhe yhteystietoa lisättäessä."
 
 #: ajax/addproperty.php:40
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "Tyhjää ominaisuutta ei voi lisätä."
 
 #: ajax/addproperty.php:52
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "Vähintään yksi osoitekenttä tulee täyttää."
 
 #: ajax/addproperty.php:62
 msgid "Trying to add duplicate property: "
@@ -39,7 +43,7 @@ msgstr ""
 
 #: ajax/addproperty.php:120
 msgid "Error adding contact property."
-msgstr ""
+msgstr "Virhe lisättäessä ominaisuutta yhteystietoon."
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
@@ -51,15 +55,15 @@ msgstr ""
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Luokkia ei ole valittu poistettavaksi."
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
-msgstr ""
+msgstr "Osoitekirjoja ei löytynyt."
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "Yhteystietoja ei löytynyt."
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
@@ -67,37 +71,34 @@ msgstr ""
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "Virhe jäsennettäessä vCardia tunnisteelle: \""
 
 #: ajax/createaddressbook.php:18
 msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "Ilman nimeä olevaa osoitekirjaa ei voi lisätä."
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "Virhe lisättäessä osoitekirjaa."
 
 #: ajax/createaddressbook.php:30
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "Virhe aktivoitaessa osoitekirjaa."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Virhe tallennettaessa tilapäistiedostoa."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -111,7 +112,7 @@ msgstr ""
 
 #: ajax/deleteproperty.php:43
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Virhe poistettaessa yhteystiedon ominaisuutta."
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
@@ -121,12 +122,44 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
+msgstr "Tiedostoa ei ole olemassa:"
+
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Virhe kuvaa ladatessa."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
 msgstr ""
 
 #: ajax/saveproperty.php:55
@@ -145,9 +178,9 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Virhe päivitettäessä yhteystiedon ominaisuutta."
 
 #: ajax/updateaddressbook.php:20
 msgid "Cannot update addressbook with an empty name."
@@ -155,165 +188,292 @@ msgstr ""
 
 #: ajax/updateaddressbook.php:26
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Virhe päivitettäessä osoitekirjaa."
 
 #: ajax/uploadimport.php:46 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Ei virhettä, tiedosto lähetettiin onnistuneesti"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Lähetetyn tiedoston koko ylittää upload_max_filesize-asetuksen arvon php.ini-tiedostossa"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Lähetetty tiedosto lähetettiin vain osittain"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Tiedostoa ei lähetetty"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
+msgstr "Tilapäiskansio puuttuu"
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
+msgstr "Yhteystiedot"
+
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
-msgstr ""
+msgstr "Osoitekirjaa ei löytynyt."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "Tämä ei ole osoitekirjasi."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
-msgstr ""
+msgstr "Yhteystietoa ei löytynyt."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
-msgstr ""
+msgstr "Osoite"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
-msgstr ""
+msgstr "Puhelin"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
-msgstr ""
+msgstr "Sähköposti"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
-msgstr ""
+msgstr "Organisaatio"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
-msgstr ""
+msgstr "Työ"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
-msgstr ""
-
-#: lib/app.php:115
-msgid "Mobile"
-msgstr ""
-
-#: lib/app.php:117
-msgid "Text"
-msgstr ""
-
-#: lib/app.php:118
-msgid "Voice"
-msgstr ""
-
-#: lib/app.php:119
-msgid "Message"
-msgstr ""
-
-#: lib/app.php:120
-msgid "Fax"
-msgstr ""
-
-#: lib/app.php:121
-msgid "Video"
-msgstr ""
+msgstr "Koti"
 
 #: lib/app.php:122
-msgid "Pager"
-msgstr ""
+msgid "Mobile"
+msgstr "Mobiili"
+
+#: lib/app.php:124
+msgid "Text"
+msgstr "Teksti"
+
+#: lib/app.php:125
+msgid "Voice"
+msgstr "Ääni"
+
+#: lib/app.php:126
+msgid "Message"
+msgstr "Viesti"
+
+#: lib/app.php:127
+msgid "Fax"
+msgstr "Faksi"
 
 #: lib/app.php:128
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:129
+msgid "Pager"
+msgstr "Hakulaite"
+
+#: lib/app.php:135
 msgid "Internet"
-msgstr ""
+msgstr "Internet"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "Henkilön {name} syntymäpäivä"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Yhteystieto"
 
 #: templates/index.php:13
 msgid "Add Contact"
-msgstr ""
+msgstr "Lisää yhteystieto"
 
 #: templates/index.php:14
 msgid "Addressbooks"
-msgstr ""
+msgstr "Osoitekirjat"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Muokkaa osoitekirjoja"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
-msgstr ""
+msgstr "Uusi osoitekirja"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
-msgstr ""
+msgstr "Tuo VCF-tiedostosta"
 
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
-msgstr ""
+msgstr "CardDav-linkki"
 
 #: templates/part.chooseaddressbook.rowfields.php:11
 msgid "Download"
-msgstr ""
+msgstr "Lataa"
 
 #: templates/part.chooseaddressbook.rowfields.php:14
 msgid "Edit"
-msgstr ""
+msgstr "Muokkaa"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
 #: templates/part.contact.php:34 templates/part.contact.php:36
 #: templates/part.contact.php:38 templates/part.contact.php:42
 msgid "Delete"
-msgstr ""
+msgstr "Poista"
 
 #: templates/part.contact.php:12
 msgid "Download contact"
-msgstr ""
+msgstr "Lataa yhteystieto"
 
 #: templates/part.contact.php:13
 msgid "Delete contact"
-msgstr ""
+msgstr "Poista yhteystieto"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
@@ -329,15 +489,15 @@ msgstr ""
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "Kutsumanimi"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "Anna kutsumanimi"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
-msgstr ""
+msgstr "Syntymäpäivä"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
@@ -345,15 +505,15 @@ msgstr ""
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "Ryhmät"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "Erota ryhmät pilkuilla"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "Muokkaa ryhmiä"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -361,11 +521,11 @@ msgstr ""
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Anna kelvollinen sähköpostiosoite."
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "Anna sähköpostiosoite"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
@@ -373,19 +533,19 @@ msgstr ""
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "Poista sähköpostiosoite"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "Anna puhelinnumero"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
-msgstr ""
+msgstr "Poista puhelinnumero"
 
 #: templates/part.contact.php:84
 msgid "View on map"
-msgstr ""
+msgstr "Näytä kartalla"
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
@@ -393,94 +553,98 @@ msgstr ""
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "Lisää huomiot tähän."
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "Lisää kenttä"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "Profiilikuva"
 
 #: templates/part.contact.php:107
 msgid "Phone"
-msgstr ""
+msgstr "Puhelin"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "Huomio"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
-msgstr ""
+msgstr "Poista nykyinen valokuva"
 
 #: templates/part.contactphoto.php:9
 msgid "Edit current photo"
-msgstr ""
+msgstr "Muokkaa nykyistä valokuvaa"
 
 #: templates/part.contactphoto.php:10
 msgid "Upload new photo"
-msgstr ""
+msgstr "Lähetä uusi valokuva"
 
 #: templates/part.contactphoto.php:11
 msgid "Select photo from ownCloud"
+msgstr "Valitse valokuva ownCloudista"
+
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
-msgstr ""
+msgstr "Muokkaa osoitetta"
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
-msgstr ""
+msgstr "Tyyppi"
 
 #: templates/part.edit_address_dialog.php:22
 #: templates/part.edit_address_dialog.php:25
 msgid "PO Box"
-msgstr ""
+msgstr "Postilokero"
 
 #: templates/part.edit_address_dialog.php:29
 #: templates/part.edit_address_dialog.php:32
 msgid "Extended"
-msgstr ""
+msgstr "Laajennettu"
 
 #: templates/part.edit_address_dialog.php:35
 #: templates/part.edit_address_dialog.php:38
 msgid "Street"
-msgstr ""
+msgstr "Katuosoite"
 
 #: templates/part.edit_address_dialog.php:41
 #: templates/part.edit_address_dialog.php:44
 msgid "City"
-msgstr ""
+msgstr "Paikkakunta"
 
 #: templates/part.edit_address_dialog.php:47
 #: templates/part.edit_address_dialog.php:50
 msgid "Region"
-msgstr ""
+msgstr "Alue"
 
 #: templates/part.edit_address_dialog.php:53
 #: templates/part.edit_address_dialog.php:56
 msgid "Zipcode"
-msgstr ""
+msgstr "Postinumero"
 
 #: templates/part.edit_address_dialog.php:59
 #: templates/part.edit_address_dialog.php:62
 msgid "Country"
-msgstr ""
+msgstr "Maa"
 
 #: templates/part.edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Muokkaa luokkia"
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Lisää"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
-msgstr ""
+msgstr "Osoitekirja"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
@@ -512,15 +676,15 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Etunimi"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Lisänimet"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Sukunimi"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
@@ -560,11 +724,11 @@ msgstr ""
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Uusi osoitekirja"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Muokkaa osoitekirjaa"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
@@ -572,84 +736,79 @@ msgstr ""
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Aktiivinen"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Tallenna"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Lähetä"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
-msgstr ""
+msgstr "Peru"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "Tuo yhteystiedon sisältävä tiedosto"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "Valitse osoitekirja"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "luo uusi osoitekirja"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
+msgstr "Uuden osoitekirjan nimi"
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Tuo"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
+msgstr "Tuodaan yhteystietoja"
 
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
-msgstr ""
+msgstr "Valitse osoitekirja, johon yhteystiedot tuodaan:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Osoitekirjassasi ei ole yhteystietoja."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Lisää yhteystieto"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "Muokkaa osoitekirjoja"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "CardDAV-synkronointiosoitteet"
 
 #: templates/settings.php:4
 msgid "more info"
@@ -661,4 +820,4 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index a92f341d79..a770488ca3 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -3,14 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jesse Jaara <jesse.jaara@gmail.com>, 2012.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
+# Johannes Korpela <>, 2012.
 # Pekka Sutela <pekka.sutela@gmail.com>, 2012.
+#   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 11:34+0000\n"
-"Last-Translator: Pekka Sutela <pekka.sutela@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,39 +24,115 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Sovelluksen nimeä ei määritelty."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Ei lisättävää luokkaa?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Tämä luokka on jo olemassa: "
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Owncloud-salasanan nollaus"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "ownCloud-salasanan nollaus"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
-msgstr ""
+msgstr "Saat sähköpostitse linkin nollataksesi salasanan."
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Requested"
-msgstr ""
+msgstr "Tilattu"
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Login failed!"
-msgstr ""
+msgstr "Kirjautuminen epäonnistui!"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
 #: templates/login.php:9
@@ -61,63 +141,63 @@ msgstr "Käyttäjätunnus"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "Request reset"
-msgstr ""
+msgstr "Tilaus lähetetty"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr ""
+msgstr "Salasanasi nollattiin"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Kirjautumissivulle"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr ""
+msgstr "Uusi salasana"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr ""
+msgstr "Palauta salasana"
 
 #: strings.php:5
 msgid "Personal"
-msgstr ""
+msgstr "Henkilökohtaiset"
 
 #: strings.php:6
 msgid "Users"
-msgstr ""
+msgstr "Käyttäjät"
 
 #: strings.php:7
 msgid "Apps"
-msgstr ""
+msgstr "Sovellukset"
 
 #: strings.php:8
 msgid "Admin"
-msgstr ""
+msgstr "Hallinta"
 
 #: strings.php:9
 msgid "Help"
-msgstr ""
+msgstr "Ohje"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Pääsy estetty"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr ""
+msgstr "Pilveä ei löydy"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Muokkaa luokkia"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Lisää"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
-msgstr ""
+msgstr "Luo <strong>ylläpitäjän tunnus</strong>"
 
 #: templates/installation.php:29 templates/login.php:13
 msgid "Password"
@@ -125,64 +205,64 @@ msgstr "Salasana"
 
 #: templates/installation.php:35
 msgid "Advanced"
-msgstr ""
+msgstr "Lisäasetukset"
 
 #: templates/installation.php:37
 msgid "Data folder"
-msgstr ""
+msgstr "Datakansio"
 
 #: templates/installation.php:44
 msgid "Configure the database"
-msgstr ""
+msgstr "Muokkaa tietokantaa"
 
 #: templates/installation.php:49 templates/installation.php:60
 #: templates/installation.php:70
 msgid "will be used"
-msgstr ""
+msgstr "käytetään"
 
 #: templates/installation.php:82
 msgid "Database user"
-msgstr ""
+msgstr "Tietokannan käyttäjä"
 
 #: templates/installation.php:86
 msgid "Database password"
-msgstr ""
+msgstr "Tietokannan salasana"
 
 #: templates/installation.php:90
 msgid "Database name"
-msgstr ""
+msgstr "Tietokannan nimi"
 
 #: templates/installation.php:96
 msgid "Database host"
-msgstr ""
+msgstr "Tietokantapalvelin"
 
 #: templates/installation.php:101
 msgid "Finish setup"
-msgstr ""
+msgstr "Viimeistele asennus"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
-msgstr ""
+msgstr "verkkopalvelut hallinnassasi"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
-msgstr ""
+msgstr "Asetukset"
 
 #: templates/login.php:6
 msgid "Lost your password?"
-msgstr ""
+msgstr "Unohditko salasanasi?"
 
 #: templates/login.php:17
 msgid "remember"
-msgstr ""
+msgstr "muista"
 
 #: templates/login.php:18
 msgid "Log in"
-msgstr ""
+msgstr "Kirjaudu sisään"
 
 #: templates/logout.php:1
 msgid "You are logged out."
@@ -190,8 +270,8 @@ msgstr "Olet kirjautunut ulos."
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
-msgstr ""
+msgstr "edellinen"
 
 #: templates/part.pagenavi.php:20
 msgid "next"
-msgstr ""
+msgstr "seuraava"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 8dd4764cd5..529f183e46 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -3,12 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jesse Jaara <jesse.jaara@gmail.com>, 2012.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
+# Johannes Korpela <>, 2012.
+#   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -19,45 +23,97 @@ msgstr ""
 
 #: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Ei virheitä, tiedosto lähetettiin onnistuneesti"
 
 #: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Lähetetty tiedosto ylittää upload_max_filesize-arvon rajan php.ini-tiedostossa"
 
 #: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Lähetetty tiedosto ylittää HTML-lomakkeessa määritetyn MAX_FILE_SIZE-arvon ylärajan"
 
 #: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Tiedoston lähetys onnistui vain osittain"
 
 #: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Yhtäkään tiedostoa ei lähetetty"
 
 #: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Väliaikaiskansiota ei ole olemassa"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
+msgstr "Levylle kirjoitus epäonnistui"
+
+#: appinfo/app.php:6
+msgid "Files"
+msgstr "Tiedostot"
+
+#: js/filelist.js:186
+msgid "undo deletion"
 msgstr ""
 
-#: appinfo/app.php:7
-msgid "Files"
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Koko"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Muutettu"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
 msgstr ""
 
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Tiedostonhallinta"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
-msgstr ""
+msgstr "Lähetettävän tiedoston suurin sallittu koko"
 
 #: templates/admin.php:7
 msgid "max. possible: "
@@ -65,89 +121,77 @@ msgstr ""
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Tarvitaan useampien tiedostojen ja kansioiden latausta varten."
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Ota ZIP-paketin lataaminen käytöön"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 on rajoittamaton"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "ZIP-tiedostojen enimmäiskoko"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Uusi"
 
 #: templates/index.php:9
 msgid "Text file"
-msgstr ""
+msgstr "Tekstitiedosto"
 
 #: templates/index.php:10
 msgid "Folder"
-msgstr ""
+msgstr "Kansio"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "Verkko-osoitteesta"
 
 #: templates/index.php:21
 msgid "Upload"
-msgstr ""
+msgstr "Lähetä"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Peru lähetys"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
-msgstr ""
+msgstr "Täällä ei ole mitään. Lähetä tänne jotakin!"
 
 #: templates/index.php:47
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Jaa"
 
 #: templates/index.php:51
 msgid "Download"
-msgstr ""
-
-#: templates/index.php:55
-msgid "Size"
-msgstr ""
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr ""
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
+msgstr "Lataa"
 
 #: templates/index.php:56
 msgid "Delete"
-msgstr ""
+msgstr "Poista"
 
 #: templates/index.php:64
 msgid "Upload too large"
-msgstr ""
+msgstr "Lähetettävä tiedosto on liian suuri"
 
 #: templates/index.php:66
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan."
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Tiedostoja tarkistetaan, odota hetki."
 
 #: templates/index.php:74
 msgid "Current scanning"
diff --git a/l10n/fi_FI/gallery.po b/l10n/fi_FI/gallery.po
index 52bdc097bf..b4ea780216 100644
--- a/l10n/fi_FI/gallery.po
+++ b/l10n/fi_FI/gallery.po
@@ -3,12 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jesse Jaara <jesse.jaara@gmail.com>, 2012.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -17,42 +19,78 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Kuvat"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Asetukset"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
 msgid "Rescan"
-msgstr ""
+msgstr "Etsi uusia"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Pysäytä"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Jaa"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Takaisin"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Poiston vahvistus"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Tahdotko poistaa albumin"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Muuta albumin nimeä"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Uuden albumin nimi"
diff --git a/l10n/fi_FI/media.po b/l10n/fi_FI/media.po
index 1ef1da9b45..86efa19e5d 100644
--- a/l10n/fi_FI/media.po
+++ b/l10n/fi_FI/media.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jesse Jaara <jesse.jaara@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,46 +18,50 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
+msgstr "Musiikki"
+
+#: js/music.js:18
+msgid "Add album to playlist"
 msgstr ""
 
-#: templates/music.php:3 templates/player.php:13
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
-msgstr ""
+msgstr "Toista"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
-msgstr ""
+msgstr "Tauko"
 
 #: templates/music.php:5
 msgid "Previous"
-msgstr ""
+msgstr "Edellinen"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
-msgstr ""
+msgstr "Seuraava"
 
 #: templates/music.php:7
 msgid "Mute"
-msgstr ""
+msgstr "Mykistä"
 
 #: templates/music.php:8
 msgid "Unmute"
-msgstr ""
+msgstr "Palauta äänet"
 
 #: templates/music.php:25
 msgid "Rescan Collection"
-msgstr ""
+msgstr "Etsi uusia kappaleita"
 
 #: templates/music.php:37
 msgid "Artist"
-msgstr ""
+msgstr "Esittäjä"
 
 #: templates/music.php:38
 msgid "Album"
-msgstr ""
+msgstr "Albumi"
 
 #: templates/music.php:39
 msgid "Title"
-msgstr ""
+msgstr "Nimi"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 01ffececf9..4034113155 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -3,12 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jesse Jaara <jesse.jaara@gmail.com>, 2012.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -18,166 +20,185 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
 msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
-msgstr ""
+msgstr "OpenID on vaihdettu"
+
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Virheellinen pyyntö"
 
 #: ajax/setlanguage.php:17
 msgid "Language changed"
+msgstr "Kieli on vaihdettu"
+
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
 msgstr ""
 
-#: personal.php:39 personal.php:40
-msgid "__language_name__"
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
 msgstr ""
 
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
+msgid "__language_name__"
+msgstr "_kielen_nimi_"
+
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Loki"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Lisää"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Lisää ohjelmasi"
 
 #: templates/apps.php:22
 msgid "Select an App"
-msgstr ""
+msgstr "Valitse ohjelma"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
-msgstr ""
+msgstr "-lisenssöity"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
-msgstr ""
+msgstr "henkilölle"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentaatio"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Suurten tiedostojen hallinta"
 
 #: templates/help.php:10
 msgid "Ask a question"
-msgstr ""
+msgstr "Kysy jotain"
 
 #: templates/help.php:22
 msgid "Problems connecting to help database."
-msgstr ""
+msgstr "Virhe yhdistettäessä tietokantaan."
 
 #: templates/help.php:23
 msgid "Go there manually."
-msgstr ""
+msgstr "Ohje löytyy sieltä."
 
 #: templates/help.php:31
 msgid "Answer"
-msgstr ""
+msgstr "Vastaus"
 
 #: templates/personal.php:8
 msgid "You use"
-msgstr ""
+msgstr "Olet käyttänyt"
 
 #: templates/personal.php:8
 msgid "of the available"
-msgstr ""
+msgstr "käytettävissäsi on yhteensä"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Tietokoneen ja mobiililaitteiden synkronointisovellukset"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Lataa"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
-msgstr ""
+msgstr "Salasanasi on vaihdettu"
 
 #: templates/personal.php:20
 msgid "Unable to change your password"
-msgstr ""
+msgstr "Salasanaasi ei voitu vaihtaa"
 
 #: templates/personal.php:21
 msgid "Current password"
-msgstr ""
+msgstr "Nykyinen salasana"
 
 #: templates/personal.php:22
 msgid "New password"
-msgstr ""
+msgstr "Uusi salasana"
 
 #: templates/personal.php:23
 msgid "show"
-msgstr ""
+msgstr "näytä"
 
 #: templates/personal.php:24
 msgid "Change password"
-msgstr ""
+msgstr "Vaihda salasana"
 
 #: templates/personal.php:30
 msgid "Email"
-msgstr ""
+msgstr "Sähköposti"
 
 #: templates/personal.php:31
 msgid "Your email address"
-msgstr ""
+msgstr "Sähköpostiosoitteesi"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Kirjoita sähköpostiosoitteesi alle, jotta unohdettu salasana voidaan palauttaa"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
-msgstr ""
+msgstr "Kieli"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr ""
+msgstr "Auta kääntämisessä"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "voit yhdistää tiedostonhallintasovelluksellasi ownCloudiin käyttämällä tätä osoitetta"
 
 #: templates/users.php:15 templates/users.php:44
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #: templates/users.php:16 templates/users.php:45
 msgid "Password"
-msgstr ""
+msgstr "Salasana"
 
 #: templates/users.php:17 templates/users.php:46 templates/users.php:60
 msgid "Groups"
-msgstr ""
+msgstr "Ryhmät"
 
 #: templates/users.php:22
 msgid "Create"
-msgstr ""
+msgstr "Luo"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Oletuskiintiö"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Muu"
 
 #: templates/users.php:47
 msgid "Quota"
-msgstr ""
+msgstr "Kiintiö"
 
 #: templates/users.php:80
 msgid "Delete"
-msgstr ""
+msgstr "Poista"
diff --git a/l10n/fr/calendar.po b/l10n/fr/calendar.po
index 84be2c67d3..b9d0abab86 100644
--- a/l10n/fr/calendar.po
+++ b/l10n/fr/calendar.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 17:01+0000\n"
-"Last-Translator: Borjan Tchakaloff <borjan@tchaka.fr>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,16 +47,40 @@ msgstr "Fuseau horaire modifié"
 msgid "Invalid request"
 msgstr "Requête invalide"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Anniversaire"
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index fe2b333ea1..4702c3bc4a 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Borjan Tchakaloff <borjan@tchaka.fr>, 2012.
 #   <fboulogne@april.org>, 2011.
 #   <gp4004@arghh.org>, 2011.
 #   <guiguidu31300@gmail.com>, 2012.
@@ -12,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 22:26+0000\n"
-"Last-Translator: rom1dep <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,23 +87,20 @@ msgstr "Erreur lors de l'ajout du carnet d'adresses."
 msgid "Error activating addressbook."
 msgstr "Erreur lors de l'activation du carnet d'adresses."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Aucun ID de contact envoyé"
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Erreur lors du chargement de l'image."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Erreur de lecture de la photo du contact."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Erreur de sauvegarde du fichier temporaire."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "La photo chargée est invalide."
 
@@ -126,14 +124,46 @@ msgstr "L'ID du contact est manquant."
 msgid "Missing contact id."
 msgstr "ID contact manquant."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Le chemin de la photo n'a pas été envoyé."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Fichier inexistant:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Erreur lors du chargement de l'image."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "Le champ Nom n'est pas défini."
@@ -150,7 +180,7 @@ msgstr "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir
 msgid "Something went FUBAR. "
 msgstr "Quelque chose est FUBAR."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Erreur lors de la mise à jour du champ."
 
@@ -166,102 +196,229 @@ msgstr "Erreur lors de la mise à jour du carnet d'adresses."
 msgid "Error uploading contacts to storage."
 msgstr "Erreur lors de l'envoi des contacts vers le stockage."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Il n'y a pas d'erreur, le fichier a été envoyé avec succes."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Le fichier envoyé dépasse la directive upload_max_filesize dans php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le fichier envoyé n'a été que partiellement envoyé."
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Pas de fichier envoyé."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Absence de dossier temporaire."
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contacts"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Glisser un fichier VCF pour importer des contacts."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Carnet d'adresses introuvable."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Ce n'est pas votre carnet d'adresses."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Ce contact n'a pu être trouvé."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Société"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Travail"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Maison"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobile"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Texte"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voix"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Message"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Vidéo"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Bipeur"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -432,6 +589,10 @@ msgstr "Envoyer une nouvelle photo"
 msgid "Select photo from ownCloud"
 msgstr "Sélectionner une photo depuis ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Editer l'adresse"
@@ -549,7 +710,7 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
@@ -588,7 +749,7 @@ msgid "Submit"
 msgstr "Envoyer"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -616,27 +777,22 @@ msgstr "Importer"
 msgid "Importing contacts"
 msgstr "Importation des contacts"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Contacts importés avec succes"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Fermer la boite de dialogue"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Importer un carnet d'adresses."
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Selectionner le carnet d'adresses à importer vers:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Glisser un fichier VCF pour importer des contacts."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Selectionner depuis le disque dur"
 
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 40e9c70c9e..b2609663ea 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 16:44+0000\n"
-"Last-Translator: Borjan Tchakaloff <borjan@tchaka.fr>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,6 +30,82 @@ msgstr "Pas de catégorie à ajouter ?"
 msgid "This category already exists: "
 msgstr "Cette catégorie existe déjà : "
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Réinitialisation de votre mot de passe Owncloud"
@@ -160,15 +236,15 @@ msgstr "Serveur de la base de données"
 msgid "Finish setup"
 msgstr "Terminer l'installation"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "services web sous votre contrôle"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Paramètres"
 
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index ff22b000dc..b510e4ac0d 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 16:58+0000\n"
-"Last-Translator: guiguidu31300 <guiguidu31300@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "Il manque un répertoire temporaire"
 msgid "Failed to write to disk"
 msgstr "Erreur d'écriture sur le disque"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Fichiers"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Taille"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modifié"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Gestion des fichiers"
@@ -121,18 +173,6 @@ msgstr "Partager"
 msgid "Download"
 msgstr "Téléchargement"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Taille"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modifié"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Supprimer tout"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Supprimer"
diff --git a/l10n/fr/gallery.po b/l10n/fr/gallery.po
index f7e7eb78e1..1bd0947079 100644
--- a/l10n/fr/gallery.po
+++ b/l10n/fr/gallery.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 17:04+0000\n"
-"Last-Translator: Borjan Tchakaloff <borjan@tchaka.fr>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,50 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Images"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Préférences"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Analyser à nouveau"
@@ -35,10 +75,6 @@ msgstr "Arrêter"
 msgid "Share"
 msgstr "Partager"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Préférences"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Retour"
diff --git a/l10n/fr/media.po b/l10n/fr/media.po
index ef6fcb0aae..e8dc770632 100644
--- a/l10n/fr/media.po
+++ b/l10n/fr/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musique"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Play"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pause"
 
@@ -34,7 +38,7 @@ msgstr "Pause"
 msgid "Previous"
 msgstr "Précédent"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Suivant"
 
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 0e1f6da4e0..5184f5e460 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 21:39+0000\n"
-"Last-Translator: rom1dep <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,23 +23,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "e-mail modifié"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Requête invalide"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "Identifiant OpenID changé"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Requête invalide"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Langue changée"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Français"
 
@@ -60,10 +75,14 @@ msgid "Select an App"
 msgstr "Sélectionner une Application"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "sous licence"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "par"
 
diff --git a/l10n/gl/calendar.po b/l10n/gl/calendar.po
index a0889618e6..64798f954a 100644
--- a/l10n/gl/calendar.po
+++ b/l10n/gl/calendar.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Non se atoparon calendarios."
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Non se atoparon eventos."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -43,79 +43,103 @@ msgstr "Fuso horario trocado"
 msgid "Invalid request"
 msgstr "Petición non válida"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendario"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "d MMM[ yyyy]{ '&#8212;'d [ MMM] yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Aniversario"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Traballo"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Chamada"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Clientes"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Remitente"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Vacacións"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Ideas"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Viaxe"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Aniversario especial"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Reunión"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Outro"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Persoal"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Proxectos"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Preguntas"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Traballo"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "sen nome"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -364,7 +388,7 @@ msgstr "Escolla os calendarios activos"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Os seus calendarios"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -373,15 +397,15 @@ msgstr "Ligazón CalDav"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Calendarios compartidos"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Sen calendarios compartidos"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Compartir calendario"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -398,7 +422,7 @@ msgstr "Borrar"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "compartido con vostede por"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -443,23 +467,23 @@ msgstr "Exportar"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Info do evento"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Repetido"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Alarma"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Participantes"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Compartir"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -471,11 +495,11 @@ msgstr "Categoría"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Separe as categorías con comas"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Editar categorías"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -596,11 +620,11 @@ msgstr "Crear un novo evento"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Ver un evento"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "Non seleccionou as categorías"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -608,11 +632,11 @@ msgstr "Seleccionar categoría"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "de"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "a"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -636,7 +660,7 @@ msgstr "12h"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "Primeiro día da semana"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
@@ -644,24 +668,24 @@ msgstr "Enderezo de sincronización do calendario CalDAV:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Usuarios"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "escoller usuarios"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Editable"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Grupos"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "escoller grupos"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "facer público"
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index 375b79dd7b..2ee23b52a1 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -83,23 +83,20 @@ msgstr "Produciuse un erro engadindo a axenda."
 msgid "Error activating addressbook."
 msgstr "Produciuse un erro activando a axenda."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -123,14 +120,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -147,7 +176,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Produciuse un erro actualizando a propiedade do contacto."
 
@@ -163,102 +192,229 @@ msgstr "Produciuse un erro actualizando a axenda."
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contactos"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Esta non é a súa axenda."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Non se atopou o contacto."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Enderezo"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organización"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Traballo"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Móbil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Paxinador"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -429,6 +585,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -585,7 +745,7 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -613,27 +773,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index f3d4afcbf6..97abae0775 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,14 +21,90 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Non se indicou o nome do aplicativo."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Sen categoría que engadir?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Esta categoría xa existe: "
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -37,7 +113,7 @@ msgstr "Restablecemento do contrasinal de Owncloud"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "Restablecer contrasinal de ownCloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -102,7 +178,7 @@ msgstr "Axuda"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Acceso denegado"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -110,11 +186,11 @@ msgstr "Nube non atopada"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Editar categorias"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Engadir"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -161,15 +237,15 @@ msgstr "Servidor da base de datos"
 msgid "Finish setup"
 msgstr "Rematar configuración"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "servizos web baixo o seu control"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Desconectar"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Preferencias"
 
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 0352347501..971843534c 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,67 @@ msgstr "Falta un cartafol temporal"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Erro ao escribir no disco"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Ficheiros"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Tamaño"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modificado"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Manexo de ficheiro"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -63,23 +115,23 @@ msgstr "Tamaño máximo de envío"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "máx. posible: "
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Preciso para descarga de varios ficheiros e cartafoles."
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Habilitar a descarga-ZIP"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 significa ilimitado"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Tamaño máximo de descarga para os ZIP"
 
 #: templates/index.php:7
 msgid "New"
@@ -95,7 +147,7 @@ msgstr "Cartafol"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "Desde url"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -103,7 +155,7 @@ msgstr "Enviar"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Cancelar subida"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -115,24 +167,12 @@ msgstr "Nome"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Compartir"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Tamaño"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modificado"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Eliminar"
@@ -149,8 +189,8 @@ msgstr "Os ficheiros que trata de subir superan o tamaño máximo permitido nest
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Estanse analizando os ficheiros, espere por favor."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Análise actual."
diff --git a/l10n/gl/gallery.po b/l10n/gl/gallery.po
index 49c0b36d3d..2a62856bb0 100644
--- a/l10n/gl/gallery.po
+++ b/l10n/gl/gallery.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,48 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Fotografías"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Configuración"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -29,15 +69,11 @@ msgstr "Analizar de novo"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Parar"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Compartir"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -45,16 +81,16 @@ msgstr "Atrás"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Eliminar confirmación"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Quere eliminar o album"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Trocar o nome do album"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Novo nome do album"
diff --git a/l10n/gl/media.po b/l10n/gl/media.po
index 10932ea508..16f55e5225 100644
--- a/l10n/gl/media.po
+++ b/l10n/gl/media.po
@@ -8,10 +8,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-06 12:06+0000\n"
-"Last-Translator: antiparvos <marcoslansgarza@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,15 +19,19 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Música"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Reproducir"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pausar"
 
@@ -35,7 +39,7 @@ msgstr "Pausar"
 msgid "Previous"
 msgstr "Anterior"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Seguinte"
 
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index ae37989e17..2d3b9ac338 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,57 +20,76 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "Correo electrónico mudado"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Petición incorrecta"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "Mudou o OpenID"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Petición incorrecta"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "O idioma mudou"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Galego"
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Conectar"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Máis"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Engade o teu aplicativo"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Escolla un Aplicativo"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licenciado"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "por"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Documentación"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Xestionar Grandes Ficheiros"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -98,11 +117,11 @@ msgstr "dun total de"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Cliente de sincronización de escritorio e móbil"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Descargar"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -170,11 +189,11 @@ msgstr "Crear"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Cuota por omisión"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Outro"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/he/calendar.po b/l10n/he/calendar.po
index bc4728f8fd..a29ec43433 100644
--- a/l10n/he/calendar.po
+++ b/l10n/he/calendar.po
@@ -5,13 +5,13 @@
 # Translators:
 # Elad Alfassa <elad@fedoraproject.org>, 2011.
 #   <tomerc+transifex.net@gmail.com>, 2011.
-# Yaron Shahrabani <sh.yaron@gmail.com>, 2011.
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -22,11 +22,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "לא נמצאו לוחות שנה."
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "לא נמצאו אירועים."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -34,7 +34,7 @@ msgstr "לוח שנה לא נכון"
 
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
-msgstr ""
+msgstr "אזור זמן חדש:"
 
 #: ajax/settings/settimezone.php:22
 msgid "Timezone changed"
@@ -44,79 +44,103 @@ msgstr "אזור זמן השתנה"
 msgid "Invalid request"
 msgstr "בקשה לא חוקית"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "ח שנה"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "d MMM [ yyyy]{ '&#8212;'d[ MMM] yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "יום הולדת"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "עסקים"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "שיחה"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "לקוחות"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "משלוח"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "חגים"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "רעיונות"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "מסע"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "יובל"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "פגישה"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "אחר"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "אישי"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "פרוייקטים"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "שאלות"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "עבודה"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "ללא שם"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -148,151 +172,151 @@ msgstr "שנתי"
 
 #: lib/object.php:343
 msgid "never"
-msgstr ""
+msgstr "לעולם לא"
 
 #: lib/object.php:344
 msgid "by occurrences"
-msgstr ""
+msgstr "לפי מופעים"
 
 #: lib/object.php:345
 msgid "by date"
-msgstr ""
+msgstr "לפי תאריך"
 
 #: lib/object.php:352
 msgid "by monthday"
-msgstr ""
+msgstr "לפי היום בחודש"
 
 #: lib/object.php:353
 msgid "by weekday"
-msgstr ""
+msgstr "לפי היום בשבוע"
 
 #: lib/object.php:360 templates/settings.php:42
 msgid "Monday"
-msgstr ""
+msgstr "יום שני"
 
 #: lib/object.php:361
 msgid "Tuesday"
-msgstr ""
+msgstr "יום שלישי"
 
 #: lib/object.php:362
 msgid "Wednesday"
-msgstr ""
+msgstr "יום רביעי"
 
 #: lib/object.php:363
 msgid "Thursday"
-msgstr ""
+msgstr "יום חמישי"
 
 #: lib/object.php:364
 msgid "Friday"
-msgstr ""
+msgstr "יום שישי"
 
 #: lib/object.php:365
 msgid "Saturday"
-msgstr ""
+msgstr "שבת"
 
 #: lib/object.php:366 templates/settings.php:43
 msgid "Sunday"
-msgstr ""
+msgstr "יום ראשון"
 
 #: lib/object.php:373
 msgid "events week of month"
-msgstr ""
+msgstr "שבוע בחודש לציון הפעילות"
 
 #: lib/object.php:374
 msgid "first"
-msgstr ""
+msgstr "ראשון"
 
 #: lib/object.php:375
 msgid "second"
-msgstr ""
+msgstr "שני"
 
 #: lib/object.php:376
 msgid "third"
-msgstr ""
+msgstr "שלישי"
 
 #: lib/object.php:377
 msgid "fourth"
-msgstr ""
+msgstr "רביעי"
 
 #: lib/object.php:378
 msgid "fifth"
-msgstr ""
+msgstr "חמישי"
 
 #: lib/object.php:379
 msgid "last"
-msgstr ""
+msgstr "אחרון"
 
 #: lib/object.php:401
 msgid "January"
-msgstr ""
+msgstr "ינואר"
 
 #: lib/object.php:402
 msgid "February"
-msgstr ""
+msgstr "פברואר"
 
 #: lib/object.php:403
 msgid "March"
-msgstr ""
+msgstr "מרץ"
 
 #: lib/object.php:404
 msgid "April"
-msgstr ""
+msgstr "אפריל"
 
 #: lib/object.php:405
 msgid "May"
-msgstr ""
+msgstr "מאי"
 
 #: lib/object.php:406
 msgid "June"
-msgstr ""
+msgstr "יוני"
 
 #: lib/object.php:407
 msgid "July"
-msgstr ""
+msgstr "יולי"
 
 #: lib/object.php:408
 msgid "August"
-msgstr ""
+msgstr "אוגוסט"
 
 #: lib/object.php:409
 msgid "September"
-msgstr ""
+msgstr "ספטמבר"
 
 #: lib/object.php:410
 msgid "October"
-msgstr ""
+msgstr "אוקטובר"
 
 #: lib/object.php:411
 msgid "November"
-msgstr ""
+msgstr "נובמבר"
 
 #: lib/object.php:412
 msgid "December"
-msgstr ""
+msgstr "דצמבר"
 
 #: lib/object.php:418
 msgid "by events date"
-msgstr ""
+msgstr "לפי תאריכי האירועים"
 
 #: lib/object.php:419
 msgid "by yearday(s)"
-msgstr ""
+msgstr "לפי ימים בשנה"
 
 #: lib/object.php:420
 msgid "by weeknumber(s)"
-msgstr ""
+msgstr "לפי מספרי השבועות"
 
 #: lib/object.php:421
 msgid "by day and month"
-msgstr ""
+msgstr "לפי יום וחודש"
 
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
-msgstr ""
+msgstr "תאריך"
 
 #: lib/search.php:40
 msgid "Cal."
-msgstr ""
+msgstr "לוח שנה"
 
 #: templates/calendar.php:11
 msgid "All day"
@@ -304,7 +328,7 @@ msgstr "לוח שנה חדש"
 
 #: templates/calendar.php:13
 msgid "Missing fields"
-msgstr ""
+msgstr "שדות חסרים"
 
 #: templates/calendar.php:14 templates/part.eventform.php:19
 #: templates/part.showevent.php:11
@@ -313,27 +337,27 @@ msgstr "כותרת"
 
 #: templates/calendar.php:16
 msgid "From Date"
-msgstr ""
+msgstr "מתאריך"
 
 #: templates/calendar.php:17
 msgid "From Time"
-msgstr ""
+msgstr "משעה"
 
 #: templates/calendar.php:18
 msgid "To Date"
-msgstr ""
+msgstr "עד תאריך"
 
 #: templates/calendar.php:19
 msgid "To Time"
-msgstr ""
+msgstr "עד שעה"
 
 #: templates/calendar.php:20
 msgid "The event ends before it starts"
-msgstr ""
+msgstr "האירוע מסתיים עוד לפני שהתחיל"
 
 #: templates/calendar.php:21
 msgid "There was a database fail"
-msgstr ""
+msgstr "אירע כשל במסד הנתונים"
 
 #: templates/calendar.php:40
 msgid "Week"
@@ -365,7 +389,7 @@ msgstr "בחר לוחות שנה פעילים"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "לוחות השנה שלך"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -374,15 +398,15 @@ msgstr "קישור CalDav"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "לוחות שנה מושתפים"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "אין לוחות שנה משותפים"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "שיתוף לוח שנה"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -399,7 +423,7 @@ msgstr "מחיקה"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "שותף אתך על ידי"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -444,23 +468,23 @@ msgstr "יצוא"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "פרטי האירוע"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "חוזר"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "תזכורת"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "משתתפים"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "שיתוף"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -472,11 +496,11 @@ msgstr "קטגוריה"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "הפרדת קטגוריות בפסיק"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "עריכת קטגוריות"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -492,7 +516,7 @@ msgstr "עבור"
 
 #: templates/part.eventform.php:76 templates/part.showevent.php:75
 msgid "Advanced options"
-msgstr ""
+msgstr "אפשרויות מתקדמות"
 
 #: templates/part.eventform.php:81 templates/part.showevent.php:80
 msgid "Location"
@@ -516,64 +540,64 @@ msgstr "חזרה"
 
 #: templates/part.eventform.php:107 templates/part.showevent.php:105
 msgid "Advanced"
-msgstr ""
+msgstr "מתקדם"
 
 #: templates/part.eventform.php:151 templates/part.showevent.php:149
 msgid "Select weekdays"
-msgstr ""
+msgstr "יש לבחור ימים בשבוע"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
 #: templates/part.showevent.php:162 templates/part.showevent.php:175
 msgid "Select days"
-msgstr ""
+msgstr "יש לבחור בימים"
 
 #: templates/part.eventform.php:169 templates/part.showevent.php:167
 msgid "and the events day of year."
-msgstr ""
+msgstr "ויום האירוע בשנה."
 
 #: templates/part.eventform.php:182 templates/part.showevent.php:180
 msgid "and the events day of month."
-msgstr ""
+msgstr "ויום האירוע בחודש."
 
 #: templates/part.eventform.php:190 templates/part.showevent.php:188
 msgid "Select months"
-msgstr ""
+msgstr "יש לבחור בחודשים"
 
 #: templates/part.eventform.php:203 templates/part.showevent.php:201
 msgid "Select weeks"
-msgstr ""
+msgstr "יש לבחור בשבועות"
 
 #: templates/part.eventform.php:208 templates/part.showevent.php:206
 msgid "and the events week of year."
-msgstr ""
+msgstr "ומספור השבוע הפעיל בשנה."
 
 #: templates/part.eventform.php:214 templates/part.showevent.php:212
 msgid "Interval"
-msgstr ""
+msgstr "משך"
 
 #: templates/part.eventform.php:220 templates/part.showevent.php:218
 msgid "End"
-msgstr ""
+msgstr "סיום"
 
 #: templates/part.eventform.php:233 templates/part.showevent.php:231
 msgid "occurrences"
-msgstr ""
+msgstr "מופעים"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "יבוא קובץ לוח שנה"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
-msgstr ""
+msgstr "נא לבחור את לוח השנה"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "יצירת לוח שנה חדש"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "שם לוח השנה החדש"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -581,15 +605,15 @@ msgstr "יבוא"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "היומן מייובא"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "היומן ייובא בהצלחה"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "סגירת הדו־שיח"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
@@ -597,11 +621,11 @@ msgstr "יצירת אירוע חדש"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "צפייה באירוע"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "לא נבחרו קטגוריות"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -609,11 +633,11 @@ msgstr "בחר קטגוריה"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "מתוך"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "בשנה"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -621,48 +645,48 @@ msgstr "אזור זמן"
 
 #: templates/settings.php:31
 msgid "Check always for changes of the timezone"
-msgstr ""
+msgstr "יש לבדוק תמיד אם יש הבדלים באזורי הזמן"
 
 #: templates/settings.php:33
 msgid "Timeformat"
-msgstr ""
+msgstr "מבנה התאריך"
 
 #: templates/settings.php:35
 msgid "24h"
-msgstr ""
+msgstr "24 שעות"
 
 #: templates/settings.php:36
 msgid "12h"
-msgstr ""
+msgstr "12 שעות"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "היום הראשון בשבוע"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
-msgstr ""
+msgstr "כתובת הסנכרון ללוח שנה מסוג CalDAV:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "משתמשים"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "נא לבחור במשתמשים"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "ניתן לעריכה"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "קבוצות"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "בחירת קבוצות"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "הפיכה לציבורי"
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index 8ba27a195b..76473c1487 100644
--- a/l10n/he/contacts.po
+++ b/l10n/he/contacts.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 #   <tomerc+transifex.net@gmail.com>, 2011.
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -20,51 +21,51 @@ msgstr ""
 
 #: ajax/activation.php:19 ajax/updateaddressbook.php:32
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "שגיאה בהפעלה או בנטרול פנקס הכתובות."
 
 #: ajax/addcontact.php:59
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "אירעה שגיאה בעת הוספת איש הקשר."
 
 #: ajax/addproperty.php:40
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "לא ניתן להוסיף מאפיין ריק."
 
 #: ajax/addproperty.php:52
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "יש למלא לפחות אחד משדות הכתובת."
 
 #: ajax/addproperty.php:62
 msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "ניסיון להוספת מאפיין כפול: "
 
 #: ajax/addproperty.php:120
 msgid "Error adding contact property."
-msgstr ""
+msgstr "שגיאה בהוספת מאפיין לאיש הקשר."
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "לא צוין מזהה"
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
-msgstr ""
+msgstr "שגיאה בהגדרת נתוני הביקורת."
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "לא נבחור קטגוריות למחיקה."
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
-msgstr ""
+msgstr "לא נמצאו פנקסי כתובות."
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "לא נמצאו אנשי קשר."
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
-msgstr ""
+msgstr "מזהה חסר"
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
@@ -76,29 +77,26 @@ msgstr ""
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "שגיאה בהוספת פנקס הכתובות."
 
 #: ajax/createaddressbook.php:30
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "שגיאה בהפעלת פנקס הכתובות."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -112,7 +110,7 @@ msgstr "המידע אודות vCard אינו נכון. נא לטעון מחדש
 
 #: ajax/deleteproperty.php:43
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "שגיאה במחיקת מאפיין של איש הקשר."
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
@@ -122,14 +120,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -146,9 +176,9 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
-msgstr ""
+msgstr "שגיאה בעדכון המאפיין של איש הקשר."
 
 #: ajax/updateaddressbook.php:20
 msgid "Cannot update addressbook with an empty name."
@@ -156,108 +186,235 @@ msgstr ""
 
 #: ajax/updateaddressbook.php:26
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "שגיאה בעדכון פנקס הכתובות."
 
 #: ajax/uploadimport.php:46 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
-msgid "Contacts"
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: lib/app.php:23
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
+msgid "Contacts"
+msgstr "אנשי קשר"
+
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "זהו אינו ספר הכתובות שלך"
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "לא ניתן לאתר איש קשר"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "כתובת"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "טלפון"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "דואר אלקטרוני"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "ארגון"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "עבודה"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "בית"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "נייד"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "טקסט"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "קולי"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "פקס"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "וידאו"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "זימונית"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -267,7 +424,7 @@ msgstr ""
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "איש קשר"
 
 #: templates/index.php:13
 msgid "Add Contact"
@@ -275,7 +432,7 @@ msgstr "הוספת איש קשר"
 
 #: templates/index.php:14
 msgid "Addressbooks"
-msgstr ""
+msgstr "פנקסי כתובות"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
@@ -283,7 +440,7 @@ msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
-msgstr ""
+msgstr "פנקס כתובות חדש"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
@@ -292,11 +449,11 @@ msgstr ""
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
-msgstr ""
+msgstr "קישור "
 
 #: templates/part.chooseaddressbook.rowfields.php:11
 msgid "Download"
-msgstr ""
+msgstr "הורדה"
 
 #: templates/part.chooseaddressbook.rowfields.php:14
 msgid "Edit"
@@ -310,11 +467,11 @@ msgstr "מחיקה"
 
 #: templates/part.contact.php:12
 msgid "Download contact"
-msgstr ""
+msgstr "הורדת איש קשר"
 
 #: templates/part.contact.php:13
 msgid "Delete contact"
-msgstr ""
+msgstr "מחיקת איש קשר"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
@@ -358,7 +515,7 @@ msgstr ""
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
-msgstr ""
+msgstr "מועדף"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
@@ -428,13 +585,17 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
-msgstr ""
+msgstr "סוג"
 
 #: templates/part.edit_address_dialog.php:22
 #: templates/part.edit_address_dialog.php:25
@@ -477,11 +638,11 @@ msgstr ""
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "הוספה"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
-msgstr ""
+msgstr "פנקס כתובות"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
@@ -561,32 +722,32 @@ msgstr ""
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "פנקס כתובות חדש"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "עריכת פנקס הכתובות"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "שם התצוגה"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "פעיל"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "שמירה"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "ביצוע"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
-msgstr ""
+msgstr "ביטול"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
@@ -612,27 +773,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/he/core.po b/l10n/he/core.po
index c701a244b4..4d10be3cda 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 #   <tomerc+transifex.net@gmail.com>, 2011.
-# Yaron Shahrabani <sh.yaron@gmail.com>, 2011.
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -21,27 +21,103 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "שם היישום לא סופק."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "אין קטגוריה להוספה?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "קטגוריה זאת כבר קיימת: "
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "איפוס הססמה של ownCloud"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "איפוס הססמה של ownCloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -70,7 +146,7 @@ msgstr "הססמה שלך אופסה"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "לדף הכניסה"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -102,7 +178,7 @@ msgstr "עזרה"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "הגישה נחסמה"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -110,11 +186,11 @@ msgstr "ענן לא נמצא"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "עריכת הקטגוריות"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "הוספה"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -161,15 +237,15 @@ msgstr "שרת בסיס נתונים"
 msgid "Finish setup"
 msgstr "סיום התקנה"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
-msgstr ""
+msgstr "שירותי רשת בשליטתך"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "התנתקות"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "הגדרות"
 
@@ -183,15 +259,15 @@ msgstr "שמירת הססמה"
 
 #: templates/login.php:18
 msgid "Log in"
-msgstr ""
+msgstr "כניסה"
 
 #: templates/logout.php:1
 msgid "You are logged out."
-msgstr "אינך מחובר."
+msgstr "לא התחברת."
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
-msgstr "קודם"
+msgstr "הקודם"
 
 #: templates/part.pagenavi.php:20
 msgid "next"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 5e823f58a6..12ed075b22 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 #   <tomerc+transifex.net@gmail.com>, 2011.
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -46,15 +47,67 @@ msgstr "תיקייה זמנית חסרה"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "הכתיבה לכונן נכשלה"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "קבצים"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "גודל"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "זמן שינוי"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "טיפול בקבצים"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -62,39 +115,39 @@ msgstr "גודל העלאה מקסימלי"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "המרבי האפשרי: "
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "נחוץ להורדה של ריבוי קבצים או תיקיות."
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "הפעלת הורדת ZIP"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 - ללא הגבלה"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "גודל הקלט המרבי לקובצי ZIP"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "חדש"
 
 #: templates/index.php:9
 msgid "Text file"
-msgstr ""
+msgstr "קובץ טקסט"
 
 #: templates/index.php:10
 msgid "Folder"
-msgstr ""
+msgstr "תיקייה"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "מכתובת"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -102,7 +155,7 @@ msgstr "העלאה"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "ביטול ההעלאה"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -114,24 +167,12 @@ msgstr "שם"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "שיתוף"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "גודל"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "זמן שינוי"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "מחיקה"
@@ -148,8 +189,8 @@ msgstr "הקבצים שניסית להעלות חרגו מהגודל המקסי
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "הקבצים נסרקים, נא להמתין."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "הסריקה הנוכחית"
diff --git a/l10n/he/gallery.po b/l10n/he/gallery.po
index 0db626f9e5..d2e1ed419a 100644
--- a/l10n/he/gallery.po
+++ b/l10n/he/gallery.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,50 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr ""
@@ -33,10 +73,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr ""
diff --git a/l10n/he/media.po b/l10n/he/media.po
index a94d7e5ee1..993c46955b 100644
--- a/l10n/he/media.po
+++ b/l10n/he/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "מוזיקה"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "נגן"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "השהה"
 
@@ -34,7 +38,7 @@ msgstr "השהה"
 msgid "Previous"
 msgstr "קודם"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "הבא"
 
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index ce7584db69..c98f33ca80 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 #   <tomerc+transifex.net@gmail.com>, 2011.
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -19,57 +20,76 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "בקשה לא חוקית"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID השתנה"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "בקשה לא חוקית"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "שפה השתנתה"
 
-#: personal.php:39 personal.php:40
-msgid "__language_name__"
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
 msgstr ""
 
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
+msgid "__language_name__"
+msgstr "עברית"
+
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "יומן"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "עוד"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "הוספת היישום שלך"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "בחירת יישום"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "רשיון"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "מאת"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "תיעוד"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "ניהול קבצים גדולים"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -97,11 +117,11 @@ msgstr "מתוך "
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "לקוחות סנכרון למחשב שולחני ולנייד"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "הורדה"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -129,15 +149,15 @@ msgstr "שינוי ססמה"
 
 #: templates/personal.php:30
 msgid "Email"
-msgstr ""
+msgstr "דוא״ל"
 
 #: templates/personal.php:31
 msgid "Your email address"
-msgstr ""
+msgstr "כתובת הדוא״ל שלך"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
@@ -145,7 +165,7 @@ msgstr "פה"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr ""
+msgstr "עזרה בתרגום"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -169,15 +189,15 @@ msgstr "יצירה"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "מכסת בררת המחדל"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "אחר"
 
 #: templates/users.php:47
 msgid "Quota"
-msgstr ""
+msgstr "מכסה"
 
 #: templates/users.php:80
 msgid "Delete"
diff --git a/l10n/hr/calendar.po b/l10n/hr/calendar.po
index 3511ae27a0..3623524514 100644
--- a/l10n/hr/calendar.po
+++ b/l10n/hr/calendar.po
@@ -4,12 +4,14 @@
 # 
 # Translators:
 # Davor Kustec <dkustec@gmail.com>, 2011.
+# Domagoj Delimar <transifex.net@domdelimar.com>, 2012.
+# Thomas Silađi <thomas.siladi@net.hr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +22,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Nisu pronađeni kalendari"
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Događaj nije pronađen."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -32,7 +34,7 @@ msgstr "Pogrešan kalendar"
 
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
-msgstr ""
+msgstr "Nova vremenska zona:"
 
 #: ajax/settings/settimezone.php:22
 msgid "Timezone changed"
@@ -42,79 +44,103 @@ msgstr "Vremenska zona promijenjena"
 msgid "Invalid request"
 msgstr "Neispravan zahtjev"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Rođendan"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Poslovno"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Poziv"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Klijenti"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Dostavljač"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
-msgstr "Odmori"
+msgstr "Praznici"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Ideje"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Putovanje"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Obljetnica"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Ostalo"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Osobno"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Projekti"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Pitanja"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "bezimeno"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -146,51 +172,51 @@ msgstr "Godišnje"
 
 #: lib/object.php:343
 msgid "never"
-msgstr ""
+msgstr "nikad"
 
 #: lib/object.php:344
 msgid "by occurrences"
-msgstr ""
+msgstr "po pojavama"
 
 #: lib/object.php:345
 msgid "by date"
-msgstr ""
+msgstr "po datum"
 
 #: lib/object.php:352
 msgid "by monthday"
-msgstr ""
+msgstr "po dana mjeseca"
 
 #: lib/object.php:353
 msgid "by weekday"
-msgstr ""
+msgstr "po tjednu"
 
 #: lib/object.php:360 templates/settings.php:42
 msgid "Monday"
-msgstr ""
+msgstr "ponedeljak"
 
 #: lib/object.php:361
 msgid "Tuesday"
-msgstr ""
+msgstr "utorak"
 
 #: lib/object.php:362
 msgid "Wednesday"
-msgstr ""
+msgstr "srijeda"
 
 #: lib/object.php:363
 msgid "Thursday"
-msgstr ""
+msgstr "četvrtak"
 
 #: lib/object.php:364
 msgid "Friday"
-msgstr ""
+msgstr "petak"
 
 #: lib/object.php:365
 msgid "Saturday"
-msgstr ""
+msgstr "subota"
 
 #: lib/object.php:366 templates/settings.php:43
 msgid "Sunday"
-msgstr ""
+msgstr "nedelja"
 
 #: lib/object.php:373
 msgid "events week of month"
@@ -198,99 +224,99 @@ msgstr ""
 
 #: lib/object.php:374
 msgid "first"
-msgstr ""
+msgstr "prvi"
 
 #: lib/object.php:375
 msgid "second"
-msgstr ""
+msgstr "drugi"
 
 #: lib/object.php:376
 msgid "third"
-msgstr ""
+msgstr "treći"
 
 #: lib/object.php:377
 msgid "fourth"
-msgstr ""
+msgstr "četvrti"
 
 #: lib/object.php:378
 msgid "fifth"
-msgstr ""
+msgstr "peti"
 
 #: lib/object.php:379
 msgid "last"
-msgstr ""
+msgstr "zadnji"
 
 #: lib/object.php:401
 msgid "January"
-msgstr ""
+msgstr "siječanj"
 
 #: lib/object.php:402
 msgid "February"
-msgstr ""
+msgstr "veljača"
 
 #: lib/object.php:403
 msgid "March"
-msgstr ""
+msgstr "ožujak"
 
 #: lib/object.php:404
 msgid "April"
-msgstr ""
+msgstr "travanj"
 
 #: lib/object.php:405
 msgid "May"
-msgstr ""
+msgstr "svibanj"
 
 #: lib/object.php:406
 msgid "June"
-msgstr ""
+msgstr "lipanj"
 
 #: lib/object.php:407
 msgid "July"
-msgstr ""
+msgstr "srpanj"
 
 #: lib/object.php:408
 msgid "August"
-msgstr ""
+msgstr "kolovoz"
 
 #: lib/object.php:409
 msgid "September"
-msgstr ""
+msgstr "rujan"
 
 #: lib/object.php:410
 msgid "October"
-msgstr ""
+msgstr "listopad"
 
 #: lib/object.php:411
 msgid "November"
-msgstr ""
+msgstr "studeni"
 
 #: lib/object.php:412
 msgid "December"
-msgstr ""
+msgstr "prosinac"
 
 #: lib/object.php:418
 msgid "by events date"
-msgstr ""
+msgstr "po datumu događaja"
 
 #: lib/object.php:419
 msgid "by yearday(s)"
-msgstr ""
+msgstr "po godini(-nama)"
 
 #: lib/object.php:420
 msgid "by weeknumber(s)"
-msgstr ""
+msgstr "po broju tjedna(-ana)"
 
 #: lib/object.php:421
 msgid "by day and month"
-msgstr ""
+msgstr "po danu i mjeseca"
 
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
-msgstr ""
+msgstr "datum"
 
 #: lib/search.php:40
 msgid "Cal."
-msgstr ""
+msgstr "Kal."
 
 #: templates/calendar.php:11
 msgid "All day"
@@ -298,7 +324,7 @@ msgstr "Cijeli dan"
 
 #: templates/calendar.php:12 templates/part.choosecalendar.php:22
 msgid "New Calendar"
-msgstr "Novi Kalendar"
+msgstr "Novi kalendar"
 
 #: templates/calendar.php:13
 msgid "Missing fields"
@@ -311,19 +337,19 @@ msgstr "Naslov"
 
 #: templates/calendar.php:16
 msgid "From Date"
-msgstr "Datum Od"
+msgstr "Datum od"
 
 #: templates/calendar.php:17
 msgid "From Time"
-msgstr "Vrijeme Od"
+msgstr "Vrijeme od"
 
 #: templates/calendar.php:18
 msgid "To Date"
-msgstr "Datum Do"
+msgstr "Datum do"
 
 #: templates/calendar.php:19
 msgid "To Time"
-msgstr "Vrijeme Do"
+msgstr "Vrijeme do"
 
 #: templates/calendar.php:20
 msgid "The event ends before it starts"
@@ -359,28 +385,28 @@ msgstr "Pogreška pri čitanju datoteke."
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
-msgstr "Odaberite aktive kalendare"
+msgstr "Odabir aktivnih kalendara"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Vaši kalendari"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
 msgid "CalDav Link"
-msgstr "CalDav Poveznica"
+msgstr "CalDav poveznica"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Podijeljeni kalendari"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Nema zajedničkih kalendara"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Podjeli kalendar"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -397,7 +423,7 @@ msgstr "Briši"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "podijeljeno s vama od "
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -442,27 +468,27 @@ msgstr "Izvoz"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Informacije o događaju"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Ponavljanje"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Alarm"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Polaznici"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Podijeli"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
-msgstr "Naslov Događaja"
+msgstr "Naslov događaja"
 
 #: templates/part.eventform.php:27 templates/part.showevent.php:19
 msgid "Category"
@@ -470,11 +496,11 @@ msgstr "Kategorija"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Odvoji kategorije zarezima"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Uredi kategorije"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -498,7 +524,7 @@ msgstr "Lokacija"
 
 #: templates/part.eventform.php:83
 msgid "Location of the Event"
-msgstr "Lokacija Događaja"
+msgstr "Lokacija događaja"
 
 #: templates/part.eventform.php:89 templates/part.showevent.php:88
 msgid "Description"
@@ -514,16 +540,16 @@ msgstr "Ponavljanje"
 
 #: templates/part.eventform.php:107 templates/part.showevent.php:105
 msgid "Advanced"
-msgstr ""
+msgstr "Napredno"
 
 #: templates/part.eventform.php:151 templates/part.showevent.php:149
 msgid "Select weekdays"
-msgstr ""
+msgstr "Odaberi dane u tjednu"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
 #: templates/part.showevent.php:162 templates/part.showevent.php:175
 msgid "Select days"
-msgstr ""
+msgstr "Odaberi dane"
 
 #: templates/part.eventform.php:169 templates/part.showevent.php:167
 msgid "and the events day of year."
@@ -535,11 +561,11 @@ msgstr ""
 
 #: templates/part.eventform.php:190 templates/part.showevent.php:188
 msgid "Select months"
-msgstr ""
+msgstr "Odaberi mjesece"
 
 #: templates/part.eventform.php:203 templates/part.showevent.php:201
 msgid "Select weeks"
-msgstr ""
+msgstr "Odaberi tjedne"
 
 #: templates/part.eventform.php:208 templates/part.showevent.php:206
 msgid "and the events week of year."
@@ -547,31 +573,31 @@ msgstr ""
 
 #: templates/part.eventform.php:214 templates/part.showevent.php:212
 msgid "Interval"
-msgstr ""
+msgstr "Interval"
 
 #: templates/part.eventform.php:220 templates/part.showevent.php:218
 msgid "End"
-msgstr ""
+msgstr "Kraj"
 
 #: templates/part.eventform.php:233 templates/part.showevent.php:231
 msgid "occurrences"
-msgstr ""
+msgstr "pojave"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Uvozite datoteku kalendara"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
-msgstr "Odaberite kalendar"
+msgstr "Odaberi kalendar"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "stvori novi kalendar"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Ime novog kalendara"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -579,15 +605,15 @@ msgstr "Uvoz"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Uvoz kalendara"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Kalendar je uspješno uvezen"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Zatvori dijalog"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
@@ -595,11 +621,11 @@ msgstr "Unesi novi događaj"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Vidjeti događaj"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "Nema odabranih kategorija"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -607,11 +633,11 @@ msgstr "Odabir kategorije"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "od"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "na"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -619,7 +645,7 @@ msgstr "Vremenska zona"
 
 #: templates/settings.php:31
 msgid "Check always for changes of the timezone"
-msgstr ""
+msgstr "Provjerite uvijek za promjene vremenske zone"
 
 #: templates/settings.php:33
 msgid "Timeformat"
@@ -635,32 +661,32 @@ msgstr "12h"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "Prvi dan tjedna"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
-msgstr "Adresa za CalDAV sinkronizaciju kalendara"
+msgstr "Adresa za CalDAV sinkronizaciju kalendara:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Korisnici"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "odaberi korisnike"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Može se uređivati"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Grupe"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "izaberite grupe"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "podjeli s javnošću"
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index 88f340006f..14ede506d8 100644
--- a/l10n/hr/contacts.po
+++ b/l10n/hr/contacts.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Davor Kustec <dkustec@gmail.com>, 2011.
+# Domagoj Delimar <transifex.net@domdelimar.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -82,23 +83,20 @@ msgstr ""
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,12 +120,44 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
+msgstr "Datoteka ne postoji:"
+
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
 msgstr ""
 
 #: ajax/saveproperty.php:55
@@ -146,7 +176,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -162,102 +192,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
-msgid "Contacts"
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: lib/app.php:23
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
+msgid "Contacts"
+msgstr "Kontakti"
+
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Ovo nije vaš adresar."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontakt ne postoji."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Kuća"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobitel"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Glasovno"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -267,7 +424,7 @@ msgstr ""
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #: templates/index.php:13
 msgid "Add Contact"
@@ -275,7 +432,7 @@ msgstr "Dodaj kontakt"
 
 #: templates/index.php:14
 msgid "Addressbooks"
-msgstr ""
+msgstr "Adresari"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
@@ -283,7 +440,7 @@ msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
-msgstr ""
+msgstr "Novi adresar"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
@@ -292,11 +449,11 @@ msgstr ""
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
-msgstr ""
+msgstr "CardDav poveznica"
 
 #: templates/part.chooseaddressbook.rowfields.php:11
 msgid "Download"
-msgstr ""
+msgstr "Preuzimanje"
 
 #: templates/part.chooseaddressbook.rowfields.php:14
 msgid "Edit"
@@ -310,11 +467,11 @@ msgstr "Obriši"
 
 #: templates/part.contact.php:12
 msgid "Download contact"
-msgstr ""
+msgstr "Preuzmi kontakt"
 
 #: templates/part.contact.php:13
 msgid "Delete contact"
-msgstr ""
+msgstr "Izbriši kontakt"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
@@ -326,15 +483,15 @@ msgstr ""
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "Uredi detalje imena"
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "Nadimak"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "Unesi nadimank"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
@@ -342,11 +499,11 @@ msgstr "Rođendan"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "dd-mm-yyyy"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "Grupe"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
@@ -354,7 +511,7 @@ msgstr ""
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "Uredi grupe"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -366,7 +523,7 @@ msgstr ""
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "Unesi email adresu"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
@@ -378,7 +535,7 @@ msgstr ""
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "Unesi broj telefona"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
@@ -386,19 +543,19 @@ msgstr ""
 
 #: templates/part.contact.php:84
 msgid "View on map"
-msgstr ""
+msgstr "Prikaži na karti"
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
-msgstr ""
+msgstr "Uredi detalje adrese"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "Dodaj bilješke ovdje."
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "Dodaj polje"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
@@ -410,7 +567,7 @@ msgstr "Telefon"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "Bilješka"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
@@ -418,7 +575,7 @@ msgstr ""
 
 #: templates/part.contactphoto.php:9
 msgid "Edit current photo"
-msgstr ""
+msgstr "Uredi trenutnu sliku"
 
 #: templates/part.contactphoto.php:10
 msgid "Upload new photo"
@@ -428,13 +585,17 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
-msgstr ""
+msgstr "Uredi adresu"
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
 #: templates/part.edit_address_dialog.php:22
 #: templates/part.edit_address_dialog.php:25
@@ -473,15 +634,15 @@ msgstr "Država"
 
 #: templates/part.edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Uredi kategorije"
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Dodaj"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
-msgstr ""
+msgstr "Adresar"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
@@ -561,11 +722,11 @@ msgstr ""
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Novi adresar"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Uredi adresar"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
@@ -577,16 +738,16 @@ msgstr ""
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Spremi"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Pošalji"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
-msgstr ""
+msgstr "Prekini"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
@@ -606,33 +767,28 @@ msgstr ""
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Uvezi"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 628afec783..fb3ceb0808 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Davor Kustec <dkustec@gmail.com>, 2011.
-# Thomas Silađi <thomas.siladi@net.hr>, 2011.
+# Domagoj Delimar <transifex.net@domdelimar.com>, 2012.
+# Thomas Silađi <thomas.siladi@net.hr>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,27 +22,103 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Ime aplikacije nije pribavljeno."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Nemate kategorija koje možete dodati?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Ova kategorija već postoji: "
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "ownCloud resetiranje lozinke"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "ownCloud resetiranje lozinke"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Koristite ovaj link da biste poništili lozinku: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -70,15 +147,15 @@ msgstr "Vaša lozinka je resetirana"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Idi na stranicu za prijavu"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr "nova lozinka"
+msgstr "Nova lozinka"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr "poništavanje lozinke"
+msgstr "Poništavanje lozinke"
 
 #: strings.php:5
 msgid "Personal"
@@ -86,23 +163,23 @@ msgstr "Osobno"
 
 #: strings.php:6
 msgid "Users"
-msgstr "korisnici"
+msgstr "Korisnici"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "aplikacije"
+msgstr "Aplikacije"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "administrator"
+msgstr "Administrator"
 
 #: strings.php:9
 msgid "Help"
-msgstr "pomoć"
+msgstr "Pomoć"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Pristup zabranjen"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -110,15 +187,15 @@ msgstr "Cloud nije pronađen"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Uredi kategorije"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Dodaj"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
-msgstr "stvoriti <strong>Administratorski račun</strong>"
+msgstr "Stvori <strong>administratorski račun</strong>"
 
 #: templates/installation.php:29 templates/login.php:13
 msgid "Password"
@@ -134,7 +211,7 @@ msgstr "Mapa baze podataka"
 
 #: templates/installation.php:44
 msgid "Configure the database"
-msgstr "konfigurirati baze podataka"
+msgstr "Konfiguriraj bazu podataka"
 
 #: templates/installation.php:49 templates/installation.php:60
 #: templates/installation.php:70
@@ -143,15 +220,15 @@ msgstr "će se koristiti"
 
 #: templates/installation.php:82
 msgid "Database user"
-msgstr "korisnik baze podataka"
+msgstr "Korisnik baze podataka"
 
 #: templates/installation.php:86
 msgid "Database password"
-msgstr "lozinka baze podataka"
+msgstr "Lozinka baze podataka"
 
 #: templates/installation.php:90
 msgid "Database name"
-msgstr "ime baze podataka"
+msgstr "Ime baze podataka"
 
 #: templates/installation.php:96
 msgid "Database host"
@@ -159,19 +236,19 @@ msgstr "Poslužitelj baze podataka"
 
 #: templates/installation.php:101
 msgid "Finish setup"
-msgstr "završiti postavljanje"
+msgstr "Završi postavljanje"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
-msgstr ""
+msgstr "web usluge pod vašom kontrolom"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
-msgstr "odjaviti"
+msgstr "Odjava"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
-msgstr "postavke"
+msgstr "Postavke"
 
 #: templates/login.php:6
 msgid "Lost your password?"
@@ -183,11 +260,11 @@ msgstr "zapamtiti"
 
 #: templates/login.php:18
 msgid "Log in"
-msgstr ""
+msgstr "Prijava"
 
 #: templates/logout.php:1
 msgid "You are logged out."
-msgstr "Vi ste odjavljeni."
+msgstr "Odjavljeni ste."
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 0c126c2581..e9ae4069b9 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Davor Kustec <dkustec@gmail.com>, 2011.
+# Thomas Silađi <thomas.siladi@net.hr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -46,15 +47,67 @@ msgstr "Nedostaje privremena mapa"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Neuspjelo pisanje na disk"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Datoteke"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Veličina"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Zadnja promjena"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "datoteka za rukovanje"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -62,39 +115,39 @@ msgstr "Maksimalna veličina prijenosa"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "maksimalna moguća: "
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Potrebno za preuzimanje više datoteke i mape"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Omogući ZIP-preuzimanje"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 je \"bez limita\""
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Maksimalna veličina za ZIP datoteke"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "novo"
 
 #: templates/index.php:9
 msgid "Text file"
-msgstr ""
+msgstr "tekstualna datoteka"
 
 #: templates/index.php:10
 msgid "Folder"
-msgstr ""
+msgstr "mapa"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "od URL-a"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -102,7 +155,7 @@ msgstr "Pošalji"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Prekini upload"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -114,24 +167,12 @@ msgstr "Naziv"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "podjeli"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Veličina"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Zadnja promjena"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Briši"
@@ -148,8 +189,8 @@ msgstr "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prij
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Datoteke se skeniraju, molimo pričekajte."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Trenutno skeniranje"
diff --git a/l10n/hr/gallery.po b/l10n/hr/gallery.po
index 70bde91e1d..3bfe413c28 100644
--- a/l10n/hr/gallery.po
+++ b/l10n/hr/gallery.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Domagoj Delimar <transifex.net@domdelimar.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,42 +18,78 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Slike"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Postavke"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
 msgid "Rescan"
-msgstr ""
+msgstr "Ponovo očitaj"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Zaustavi"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Podijeli"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Natrag"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Ukloni potvrdu"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Želite li ukloniti album"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Promijeni ime albuma"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Novo ime albuma"
diff --git a/l10n/hr/media.po b/l10n/hr/media.po
index 5159479c67..aa4711f5d5 100644
--- a/l10n/hr/media.po
+++ b/l10n/hr/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Glazba"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Reprodukcija"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pauza"
 
@@ -34,7 +38,7 @@ msgstr "Pauza"
 msgid "Previous"
 msgstr "Prethodna"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Sljedeća"
 
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index fc581b6447..8d0166d701 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Davor Kustec <dkustec@gmail.com>, 2011.
+# Thomas Silađi <thomas.siladi@net.hr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,57 +20,76 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Neispravan zahtjev"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID promijenjen"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Neispravan zahtjev"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Jezik promijenjen"
 
-#: personal.php:39 personal.php:40
-msgid "__language_name__"
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
 msgstr ""
 
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
+msgid "__language_name__"
+msgstr "__ime_jezika__"
+
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "dnevnik"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "više"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Dodajte vašu aplikaciju"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Odaberite Aplikaciju"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licencirano"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "od"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "dokumentacija"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Upravljanje velikih datoteka"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -97,11 +117,11 @@ msgstr "od dostupno"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Desktop i Mobile sinkronizaciji klijenti"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "preuzimanje"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -129,15 +149,15 @@ msgstr "Izmjena lozinke"
 
 #: templates/personal.php:30
 msgid "Email"
-msgstr ""
+msgstr "e-mail adresa"
 
 #: templates/personal.php:31
 msgid "Your email address"
-msgstr ""
+msgstr "Vaša e-mail adresa"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
@@ -145,7 +165,7 @@ msgstr "Jezik"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr ""
+msgstr "Pomoć prevesti"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -169,15 +189,15 @@ msgstr "Izradi"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "standardni kvota"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "ostali"
 
 #: templates/users.php:47
 msgid "Quota"
-msgstr ""
+msgstr "kvota"
 
 #: templates/users.php:80
 msgid "Delete"
diff --git a/l10n/hu_HU/calendar.po b/l10n/hu_HU/calendar.po
index e3dacabef1..3922bbb27e 100644
--- a/l10n/hu_HU/calendar.po
+++ b/l10n/hu_HU/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 21:58+0000\n"
-"Last-Translator: Adam Toth <adazlord@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,16 +43,40 @@ msgstr "Időzóna megváltozott"
 msgid "Invalid request"
 msgstr "Érvénytelen kérés"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Naptár"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Születésap"
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index 7cc910a4ca..bff0548d69 100644
--- a/l10n/hu_HU/contacts.po
+++ b/l10n/hu_HU/contacts.po
@@ -6,13 +6,14 @@
 # Adam Toth <adazlord@gmail.com>, 2012.
 #   <mail@tamas-nagy.net>, 2011.
 # Peter Borsa <peter.borsa@gmail.com>, 2011.
+# Tamas Nagy <mail@tamas-nagy.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 22:02+0000\n"
-"Last-Translator: Adam Toth <adazlord@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +27,7 @@ msgstr "Címlista (de)aktiválása sikertelen"
 
 #: ajax/addcontact.php:59
 msgid "There was an error adding the contact."
-msgstr "Hiba a kontakt hozzáadásakor"
+msgstr "Hiba a kapcsolat hozzáadásakor"
 
 #: ajax/addproperty.php:40
 msgid "Cannot add empty property."
@@ -42,7 +43,7 @@ msgstr "Kísérlet dupla tulajdonság hozzáadására: "
 
 #: ajax/addproperty.php:120
 msgid "Error adding contact property."
-msgstr "Hiba a kontakt-tulajdonság hozzáadásakor"
+msgstr "Hiba a kapcsolat-tulajdonság hozzáadásakor"
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
@@ -84,23 +85,20 @@ msgstr "Hiba a címlista hozzáadásakor"
 msgid "Error activating addressbook."
 msgstr "Címlista aktiválása sikertelen"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Nincs ID megadva a kontakthoz"
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Kép betöltése sikertelen"
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "A kontakt képének beolvasása sikertelen"
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Ideiglenes fájl mentése sikertelen"
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "A kép érvénytelen"
 
@@ -114,24 +112,56 @@ msgstr "A vCardról szóló információ helytelen. Töltsd újra az oldalt."
 
 #: ajax/deleteproperty.php:43
 msgid "Error deleting contact property."
-msgstr "Hiba a kontakt-tulajdonság törlésekor"
+msgstr "Hiba a kapcsolat-tulajdonság törlésekor"
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
-msgstr "Hiányzik a kontakt ID"
+msgstr "Hiányzik a kapcsolat ID"
 
 #: ajax/loadphoto.php:44
 msgid "Missing contact id."
 msgstr "Hiányzik a kontakt ID"
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Nincs fénykép-útvonal megadva"
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "A fájl nem létezik:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Kép betöltése sikertelen"
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "az elem neve nincs beállítva"
@@ -148,9 +178,9 @@ msgstr "Helytelen információ a vCardról. Töltse újra az oldalt: "
 msgid "Something went FUBAR. "
 msgstr "Valami balul sült el."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
-msgstr "Hiba a kontakt-tulajdonság frissítésekor"
+msgstr "Hiba a kapcsolat-tulajdonság frissítésekor"
 
 #: ajax/updateaddressbook.php:20
 msgid "Cannot update addressbook with an empty name."
@@ -162,104 +192,231 @@ msgstr "Hiba a címlista frissítésekor"
 
 #: ajax/uploadimport.php:46 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr "Hiba a kontaktok feltöltésekor"
+msgstr "Hiba a kapcsolatok feltöltésekor"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Nincs hiba, a fájl sikeresen feltöltődött"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "A feltöltött fájl mérete meghaladja az upload_max_filesize értéket a php.ini-ben"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "A feltöltött fájl mérete meghaladja a HTML form-ban megadott MAX_FILE_SIZE értéket"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "A fájl csak részlegesen lett feltöltve"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Nincs feltöltött fájl"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Hiányzik az ideiglenes könyvtár"
 
-#: appinfo/app.php:22 templates/settings.php:3
-msgid "Contacts"
-msgstr "Kontaktok"
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
 
-#: lib/app.php:23
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
+msgid "Contacts"
+msgstr "Kapcsolatok"
+
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Húzza ide a VCF fájlt a kapcsolatok importálásához"
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Címlista nem található"
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Ez nem a te címjegyzéked."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kapcsolat nem található."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Cím"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefonszám"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Szervezet"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Munkahelyi"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Otthoni"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobiltelefonszám"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Szöveg"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Hang"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Üzenet"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Személyhívó"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -269,11 +426,11 @@ msgstr "{name} születésnapja"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr "Kontakt"
+msgstr "Kapcsolat"
 
 #: templates/index.php:13
 msgid "Add Contact"
-msgstr "Kontakt hozzáadása"
+msgstr "Kapcsolat hozzáadása"
 
 #: templates/index.php:14
 msgid "Addressbooks"
@@ -312,11 +469,11 @@ msgstr "Törlés"
 
 #: templates/part.contact.php:12
 msgid "Download contact"
-msgstr "Kontakt letöltése"
+msgstr "Kapcsolat letöltése"
 
 #: templates/part.contact.php:13
 msgid "Delete contact"
-msgstr "Kontakt törlése"
+msgstr "Kapcsolat törlése"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
@@ -430,6 +587,10 @@ msgstr "Új kép feltöltése"
 msgid "Select photo from ownCloud"
 msgstr "Kép kiválasztása ownCloud-ból"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Cím szerkesztése"
@@ -511,7 +672,7 @@ msgstr "Mrs"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr "Dr"
+msgstr "Dr."
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
@@ -586,13 +747,13 @@ msgid "Submit"
 msgstr "Elküld"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Mégsem"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr "Kontakt-fájl importálása"
+msgstr "Kapcsolat-fájl importálása"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
@@ -612,39 +773,34 @@ msgstr "Import"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr "Kontaktok importálása"
-
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Kontaktok importálása sikeres"
+msgstr "Kapcsolatok importálása"
 
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Párbeszédablak bezárása"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Címlista importálása"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Melyik címlistába történjen az importálás:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Húzza ide a VCF fájlt a kontaktok importálásához"
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Kiválasztás merevlemezről"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr "Nincs kontakt a címlistában"
+msgstr "Nincsenek kapcsolatok a címlistában"
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr "Kontakt hozzáadása"
+msgstr "Kapcsolat hozzáadása"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
@@ -656,7 +812,7 @@ msgstr "CardDAV szinkronizációs címek"
 
 #: templates/settings.php:4
 msgid "more info"
-msgstr "további infó"
+msgstr "további információ"
 
 #: templates/settings.php:6
 msgid "Primary address (Kontact et al)"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 72f237d2d1..7aba93b972 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 19:46+0000\n"
-"Last-Translator: Adam Toth <adazlord@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,6 +32,82 @@ msgstr "Nincs hozzáadandó kategória?"
 msgid "This category already exists: "
 msgstr "Ez a kategória már létezik"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "ownCloud jelszó-visszaállítás"
@@ -162,15 +238,15 @@ msgstr "Adatbázis szerver"
 msgid "Finish setup"
 msgstr "Beállítások befejezése"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "webszolgáltatások az irányításod alatt"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Kilépés"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Beállítások"
 
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index c846e2e6c5..12a4d449b2 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 19:33+0000\n"
-"Last-Translator: Adam Toth <adazlord@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,10 +50,62 @@ msgstr "Hiányzik az ideiglenes könyvtár"
 msgid "Failed to write to disk"
 msgstr "Nem írható lemezre"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Fájlok"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Méret"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Módosítva"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Fájlkezelés"
@@ -122,18 +174,6 @@ msgstr "Megosztás"
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Méret"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Módosítva"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Mindent töröl"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Törlés"
diff --git a/l10n/hu_HU/gallery.po b/l10n/hu_HU/gallery.po
index a732dbfcda..2953d7adda 100644
--- a/l10n/hu_HU/gallery.po
+++ b/l10n/hu_HU/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 21:43+0000\n"
-"Last-Translator: Adam Toth <adazlord@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Képek"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Beállítások"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Újravizsgálás"
@@ -34,10 +74,6 @@ msgstr "Állj"
 msgid "Share"
 msgstr "Megosztás"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Beállítások"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Vissza"
diff --git a/l10n/hu_HU/media.po b/l10n/hu_HU/media.po
index bd041974a0..aead2550d9 100644
--- a/l10n/hu_HU/media.po
+++ b/l10n/hu_HU/media.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 19:27+0000\n"
-"Last-Translator: Adam Toth <adazlord@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,6 +23,10 @@ msgstr ""
 msgid "Music"
 msgstr "Zene"
 
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Lejátszás"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 56c5d55264..76b3a2b040 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 19:56+0000\n"
-"Last-Translator: Adam Toth <adazlord@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,23 +20,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "Email megváltozott"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Érvénytelen kérés"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID megváltozott"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Érvénytelen kérés"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "A nyelv megváltozott"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -57,10 +72,14 @@ msgid "Select an App"
 msgstr "Egy App kiválasztása"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licencelt"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr ":"
 
diff --git a/l10n/hy/calendar.po b/l10n/hy/calendar.po
index 2a56e7e748..fa2e38c97a 100644
--- a/l10n/hy/calendar.po
+++ b/l10n/hy/calendar.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -42,77 +42,101 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Օրացույց"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
-msgid "Birthday"
-msgstr ""
-
-#: lib/app.php:123
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:124
-msgid "Call"
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
 msgstr ""
 
 #: lib/app.php:125
-msgid "Clients"
+msgid "Birthday"
 msgstr ""
 
 #: lib/app.php:126
-msgid "Deliverer"
+msgid "Business"
 msgstr ""
 
 #: lib/app.php:127
-msgid "Holidays"
+msgid "Call"
 msgstr ""
 
 #: lib/app.php:128
-msgid "Ideas"
+msgid "Clients"
 msgstr ""
 
 #: lib/app.php:129
-msgid "Journey"
+msgid "Deliverer"
 msgstr ""
 
 #: lib/app.php:130
-msgid "Jubilee"
+msgid "Holidays"
 msgstr ""
 
 #: lib/app.php:131
-msgid "Meeting"
+msgid "Ideas"
 msgstr ""
 
 #: lib/app.php:132
-msgid "Other"
-msgstr "Այլ"
+msgid "Journey"
+msgstr ""
 
 #: lib/app.php:133
-msgid "Personal"
+msgid "Jubilee"
 msgstr ""
 
 #: lib/app.php:134
-msgid "Projects"
+msgid "Meeting"
 msgstr ""
 
 #: lib/app.php:135
+msgid "Other"
+msgstr "Այլ"
+
+#: lib/app.php:136
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:137
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:138
 msgid "Questions"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index aa1f44970c..824bab0c47 100644
--- a/l10n/hy/contacts.po
+++ b/l10n/hy/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -81,23 +81,20 @@ msgstr ""
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -121,14 +118,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -145,7 +174,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,102 +190,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -427,6 +583,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -583,7 +743,7 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -611,27 +771,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 5cf9a7c6de..0880df331a 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -29,6 +29,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr ""
@@ -159,15 +235,15 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr ""
 
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index d3fe3e8be5..e0a959181a 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -47,10 +47,62 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr ""
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr ""
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -119,18 +171,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:55
-msgid "Size"
-msgstr ""
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr ""
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr ""
diff --git a/l10n/hy/gallery.po b/l10n/hy/gallery.po
index 91c06fde01..c9eb3b260a 100644
--- a/l10n/hy/gallery.po
+++ b/l10n/hy/gallery.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,50 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr ""
@@ -33,10 +73,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr ""
diff --git a/l10n/hy/media.po b/l10n/hy/media.po
index bb8443a3e7..fb40ed0755 100644
--- a/l10n/hy/media.po
+++ b/l10n/hy/media.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,19 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr ""
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr ""
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr ""
 
@@ -33,7 +37,7 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr ""
 
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 59b841098f..36ffa29c8e 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -18,23 +18,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
 msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr ""
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr ""
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr ""
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -55,10 +70,14 @@ msgid "Select an App"
 msgstr ""
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr ""
 
diff --git a/l10n/ia/calendar.po b/l10n/ia/calendar.po
index 6b9b70f7c1..125085ee3a 100644
--- a/l10n/ia/calendar.po
+++ b/l10n/ia/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 03:44+0000\n"
-"Last-Translator: Emilio Sepúlveda <emisepulvedam@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,16 +42,40 @@ msgstr ""
 msgid "Invalid request"
 msgstr "Requesta invalide."
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendario"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Anniversario de nativitate"
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index 33da0ad226..7c0c0d4b01 100644
--- a/l10n/ia/contacts.po
+++ b/l10n/ia/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -83,23 +83,20 @@ msgstr "Error durante que il addeva le adressario."
 msgid "Error activating addressbook."
 msgstr "Error in activar adressario"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Il habeva un error durante le cargamento del imagine."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Error durante le scriptura in le file temporari"
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -123,14 +120,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Il habeva un error durante le cargamento del imagine."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -147,7 +176,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -163,102 +192,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Nulle file esseva incargate."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Manca un dossier temporari"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contactos"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Adressario non trovate."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Iste non es tu libro de adresses"
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Contacto non poterea esser legite"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telephono"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-posta"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Travalio"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Domo"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobile"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Message"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -429,6 +585,10 @@ msgstr "Incargar nove photo"
 msgid "Select photo from ownCloud"
 msgstr "Seliger photo ex ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Modificar adresses"
@@ -585,7 +745,7 @@ msgid "Submit"
 msgstr "Submitter"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancellar"
 
@@ -613,27 +773,22 @@ msgstr "Importar"
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Contactos importate con successo."
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Clauder dialogo"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Importar adressario."
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 08b5615cb9..e81a57a40b 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 03:49+0000\n"
-"Last-Translator: Emilio Sepúlveda <emisepulvedam@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,6 +30,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr "Iste categoria jam existe:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Reinitialisation del contrasigno de Owncloud"
@@ -160,15 +236,15 @@ msgstr "Hospite de base de datos"
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "servicios web sub tu controlo"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Clauder le session"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Configurationes"
 
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 48a885f455..6d9a5ffc3f 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -49,10 +49,62 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Files"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Dimension"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modificate"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -121,18 +173,6 @@ msgstr ""
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Dimension"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modificate"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Deler"
diff --git a/l10n/ia/gallery.po b/l10n/ia/gallery.po
index da4c273778..3e8249066f 100644
--- a/l10n/ia/gallery.po
+++ b/l10n/ia/gallery.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Rescannar"
@@ -34,10 +74,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Retro"
diff --git a/l10n/ia/media.po b/l10n/ia/media.po
index 283d694f4c..4da59fbd03 100644
--- a/l10n/ia/media.po
+++ b/l10n/ia/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musica"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Reproducer"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pausa"
 
@@ -34,7 +38,7 @@ msgstr "Pausa"
 msgid "Previous"
 msgstr "Previe"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Proxime"
 
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 352f0ac127..304d175a07 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 03:49+0000\n"
-"Last-Translator: Emilio Sepúlveda <emisepulvedam@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,23 +20,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Requesta invalide"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID cambiate"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Requesta invalide"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Linguage cambiate"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Interlingua"
 
@@ -57,10 +72,14 @@ msgid "Select an App"
 msgstr "Selectionar un app"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "per"
 
diff --git a/l10n/id/calendar.po b/l10n/id/calendar.po
index 204a1e4980..021c23176e 100644
--- a/l10n/id/calendar.po
+++ b/l10n/id/calendar.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -42,77 +42,101 @@ msgstr "Zona waktu telah diubah"
 msgid "Invalid request"
 msgstr "Permintaan tidak sah"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
-msgid "Birthday"
-msgstr ""
-
-#: lib/app.php:123
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:124
-msgid "Call"
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
 msgstr ""
 
 #: lib/app.php:125
-msgid "Clients"
+msgid "Birthday"
 msgstr ""
 
 #: lib/app.php:126
-msgid "Deliverer"
+msgid "Business"
 msgstr ""
 
 #: lib/app.php:127
-msgid "Holidays"
+msgid "Call"
 msgstr ""
 
 #: lib/app.php:128
-msgid "Ideas"
+msgid "Clients"
 msgstr ""
 
 #: lib/app.php:129
-msgid "Journey"
+msgid "Deliverer"
 msgstr ""
 
 #: lib/app.php:130
-msgid "Jubilee"
+msgid "Holidays"
 msgstr ""
 
 #: lib/app.php:131
-msgid "Meeting"
+msgid "Ideas"
 msgstr ""
 
 #: lib/app.php:132
-msgid "Other"
+msgid "Journey"
 msgstr ""
 
 #: lib/app.php:133
-msgid "Personal"
+msgid "Jubilee"
 msgstr ""
 
 #: lib/app.php:134
-msgid "Projects"
+msgid "Meeting"
 msgstr ""
 
 #: lib/app.php:135
-msgid "Questions"
+msgid "Other"
 msgstr ""
 
 #: lib/app.php:136
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:137
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:138
+msgid "Questions"
+msgstr ""
+
+#: lib/app.php:139
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index 94c1539c37..0a3d9aab36 100644
--- a/l10n/id/contacts.po
+++ b/l10n/id/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -81,23 +81,20 @@ msgstr ""
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -121,14 +118,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -145,7 +174,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,102 +190,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -427,6 +583,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -583,7 +743,7 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -611,27 +771,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 6cb907c557..04caad7d31 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Muhammad Panji <sumodirjo@gmail.com>, 2012.
 # Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -20,39 +21,115 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Nama aplikasi tidak diberikan."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Tidak ada kategori yang akan ditambahkan?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Kategori ini sudah ada:"
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Reset password Owncloud"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "reset password ownCloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Gunakan tautan berikut untuk mereset password anda: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
-msgstr ""
+msgstr "Anda akan mendapatkan link untuk mereset password anda lewat Email."
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Requested"
-msgstr ""
+msgstr "Telah diminta"
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Login failed!"
-msgstr ""
+msgstr "Login gagal!"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
 #: templates/login.php:9
@@ -61,23 +138,23 @@ msgstr "Username"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "Request reset"
-msgstr ""
+msgstr "Meminta reset"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr ""
+msgstr "Password anda telah direset"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Ke halaman login"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr ""
+msgstr "Password baru"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr ""
+msgstr "Reset password"
 
 #: strings.php:5
 msgid "Personal"
@@ -101,7 +178,7 @@ msgstr "Bantuan"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Akses Ditiadakan"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -109,11 +186,11 @@ msgstr "Cloud tidak ditemukan"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Edit kategori"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Tambahkan"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -160,15 +237,15 @@ msgstr "Host database"
 msgid "Finish setup"
 msgstr "Selesaikan instalasi"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
-msgstr ""
+msgstr "web service dibawah kontrol anda"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Keluar"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Setelan"
 
@@ -182,7 +259,7 @@ msgstr "selalu login"
 
 #: templates/login.php:18
 msgid "Log in"
-msgstr ""
+msgstr "Masuk"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/id/files.po b/l10n/id/files.po
index ed604497d0..8e1f3da575 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Muhammad Panji <sumodirjo@gmail.com>, 2012.
 # Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +21,7 @@ msgstr ""
 
 #: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Tidak ada galat, berkas sukses diunggah"
 
 #: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
@@ -34,27 +35,79 @@ msgstr ""
 
 #: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Berkas hanya diunggah sebagian"
 
 #: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Tidak ada berkas yang diunggah"
 
 #: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Kehilangan folder temporer"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Gagal menulis ke disk"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Berkas"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Ukuran"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Dimodifikasi"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Penanganan berkas"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -62,39 +115,39 @@ msgstr "Ukuran unggah maksimum"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "Kemungkinan maks:"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Dibutuhkan untuk multi-berkas dan unduhan folder"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Aktifkan unduhan ZIP"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 adalah tidak terbatas"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Ukuran masukan maksimal untuk berkas ZIP"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Baru"
 
 #: templates/index.php:9
 msgid "Text file"
-msgstr ""
+msgstr "Berkas teks"
 
 #: templates/index.php:10
 msgid "Folder"
-msgstr ""
+msgstr "Folder"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "Dari url"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -102,7 +155,7 @@ msgstr "Unggah"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Batal mengunggah"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -114,24 +167,12 @@ msgstr "Nama"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Bagikan"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Ukuran"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Dimodifikasi"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Hapus"
@@ -148,8 +189,8 @@ msgstr "Berkas yang anda coba unggah melebihi ukuran maksimum untuk pengunggahan
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Berkas sedang dipindai, silahkan tunggu."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Sedang memindai"
diff --git a/l10n/id/gallery.po b/l10n/id/gallery.po
index 3836746cef..6b4c75eae9 100644
--- a/l10n/id/gallery.po
+++ b/l10n/id/gallery.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Muhammad Panji <sumodirjo@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,42 +18,78 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Gambar"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Setting"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
 msgid "Rescan"
-msgstr ""
+msgstr "Scan ulang"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Berhenti"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Bagikan"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Kembali"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Hapus konfirmasi"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Apakah anda ingin menghapus album"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Ubah nama album"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Nama album baru"
diff --git a/l10n/id/media.po b/l10n/id/media.po
index 77057473f1..5d6c3e38ec 100644
--- a/l10n/id/media.po
+++ b/l10n/id/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musik"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Mainkan"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Jeda"
 
@@ -34,7 +38,7 @@ msgstr "Jeda"
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Selanjutnya"
 
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 9e9b82b838..f0fe672de8 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Muhammad Panji <sumodirjo@gmail.com>, 2012.
 # Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -19,57 +20,76 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Permintaan tidak valid"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID telah dirubah"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Permintaan tidak valid"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Bahasa telah diganti"
 
-#: personal.php:39 personal.php:40
-msgid "__language_name__"
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
 msgstr ""
 
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
+msgid "__language_name__"
+msgstr "__language_name__"
+
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Lebih"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Tambahkan App anda"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Pilih satu aplikasi"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-terlisensi"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "oleh"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentasi"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Mengelola berkas besar"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -97,11 +117,11 @@ msgstr "dari yang tersedia"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Klien sync Desktop dan Mobile"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Unduh"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -129,15 +149,15 @@ msgstr "Rubah password"
 
 #: templates/personal.php:30
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #: templates/personal.php:31
 msgid "Your email address"
-msgstr ""
+msgstr "Alamat email anda"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Masukkan alamat email untuk mengaktifkan pemulihan password"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
@@ -145,7 +165,7 @@ msgstr "Bahasa"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr ""
+msgstr "Bantu menerjemahkan"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -169,15 +189,15 @@ msgstr "Buat"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Kuota default"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Lain-lain"
 
 #: templates/users.php:47
 msgid "Quota"
-msgstr ""
+msgstr "Quota"
 
 #: templates/users.php:80
 msgid "Delete"
diff --git a/l10n/it/calendar.po b/l10n/it/calendar.po
index dcc55dbfef..ed36e36d84 100644
--- a/l10n/it/calendar.po
+++ b/l10n/it/calendar.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 12:54+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,16 +49,40 @@ msgstr "Fuso orario cambiato"
 msgid "Invalid request"
 msgstr "Richiesta non valida"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendario"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Compleanno"
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index 88873e6864..0e1a62a6f9 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -85,23 +85,20 @@ msgstr "Errore durante l'aggiunta della rubrica."
 msgid "Error activating addressbook."
 msgstr "Errore durante l'attivazione della rubrica."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Nessun ID di contatto inviato."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Errore di caricamento immagine."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Errore di lettura della foto del contatto."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Errore di salvataggio del file temporaneo."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "La foto caricata non è valida."
 
@@ -125,14 +122,46 @@ msgstr "Manca l'ID del contatto."
 msgid "Missing contact id."
 msgstr "ID di contatto mancante."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Non è stato inviato alcun percorso a una foto."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Il file non esiste:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Errore di caricamento immagine."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "il nome dell'elemento non è impostato."
@@ -149,7 +178,7 @@ msgstr "Le informazioni della vCard non sono corrette. Ricarica la pagina: "
 msgid "Something went FUBAR. "
 msgstr "Qualcosa è andato storto. "
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Errore durante l'aggiornamento della proprietà del contatto."
 
@@ -165,102 +194,229 @@ msgstr "Errore durante l'aggiornamento della rubrica."
 msgid "Error uploading contacts to storage."
 msgstr "Errore di invio dei contatti in archivio."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Non ci sono errori, il file è stato inviato correttamente"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Il file inviato supera la direttiva upload_max_filesize nel php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Il file è stato inviato solo parzialmente"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Nessun file è stato inviato"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Manca una cartella temporanea"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contatti"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Rilascia un file VCF per importare i contatti."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Rubrica non trovata."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Questa non è la tua rubrica."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Il contatto non può essere trovato."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Indirizzo"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefono"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Lavoro"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Testo"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Messaggio"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Cercapersone"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -431,6 +587,10 @@ msgstr "Invia una nuova foto"
 msgid "Select photo from ownCloud"
 msgstr "Seleziona la foto da ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Modifica indirizzo"
@@ -587,7 +747,7 @@ msgid "Submit"
 msgstr "Invia"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -615,27 +775,22 @@ msgstr "Importa"
 msgid "Importing contacts"
 msgstr "Importazione contatti"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Contatti importati correttamente"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Chiudi finestra"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Importa rubrica"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Seleziona la rubrica di destinazione:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Rilascia un file VCF per importare i contatti."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Seleziona da disco"
 
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 550381b026..c2d63be3c9 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 10:44+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,6 +34,82 @@ msgstr "Nessuna categoria da aggiungere?"
 msgid "This category already exists: "
 msgstr "Questa categoria esiste già: "
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Ripristino password di Owncloud"
@@ -164,15 +240,15 @@ msgstr "Host del database"
 msgid "Finish setup"
 msgstr "Termina la configurazione"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "servizi web nelle tue mani"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Esci"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Impostazioni"
 
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 4b76071bb8..8db41dc647 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 12:55+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,10 +51,62 @@ msgstr "Cartella temporanea mancante"
 msgid "Failed to write to disk"
 msgstr "Scrittura su disco non riuscita"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "File"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Dimensione"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modificato"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Gestione file"
@@ -123,18 +175,6 @@ msgstr "Condividi"
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Dimensione"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modificato"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Elimina tutto"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Elimina"
diff --git a/l10n/it/gallery.po b/l10n/it/gallery.po
index 17d761b0da..794458ec1f 100644
--- a/l10n/it/gallery.po
+++ b/l10n/it/gallery.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 10:42+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,10 +20,50 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Immagini"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Nuova scansione"
@@ -36,10 +76,6 @@ msgstr "Ferma"
 msgid "Share"
 msgstr "Condividi"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Impostazioni"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Indietro"
diff --git a/l10n/it/media.po b/l10n/it/media.po
index b87e35f551..054877623e 100644
--- a/l10n/it/media.po
+++ b/l10n/it/media.po
@@ -9,10 +9,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,15 +20,19 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musica"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Riproduci"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pausa"
 
@@ -36,7 +40,7 @@ msgstr "Pausa"
 msgid "Previous"
 msgstr "Precedente"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Successivo"
 
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index dd27799948..56936ed81f 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 10:50+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,23 +25,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "Email modificata"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Richiesta non valida"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID modificato"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Richiesta non valida"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Lingua modificata"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Italiano"
 
@@ -62,10 +77,14 @@ msgid "Select an App"
 msgstr "Seleziona un'applicazione"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-rilasciato"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "da"
 
diff --git a/l10n/ja_JP/calendar.po b/l10n/ja_JP/calendar.po
index 1d6ed9e4cb..6062061a4f 100644
--- a/l10n/ja_JP/calendar.po
+++ b/l10n/ja_JP/calendar.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +20,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "カレンダーが見つかりませんでした。"
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "イベントが見つかりませんでした。"
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -41,77 +42,101 @@ msgstr "タイムゾーンが変更されました"
 msgid "Invalid request"
 msgstr "無効なリクエストです"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "カレンダー"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "誕生日"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "ビジネス"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "電話をかける"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "顧客"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "運送会社"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "休日"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "アイデア"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "旅行"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "記念祭"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "ミーティング"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "その他"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "個人"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "プロジェクト"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "質問事項"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
-msgstr "仕事"
+msgstr "週の始まり"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
@@ -165,31 +190,31 @@ msgstr "曜日で指定"
 
 #: lib/object.php:360 templates/settings.php:42
 msgid "Monday"
-msgstr "月曜日"
+msgstr "月曜"
 
 #: lib/object.php:361
 msgid "Tuesday"
-msgstr "火曜日"
+msgstr "火曜"
 
 #: lib/object.php:362
 msgid "Wednesday"
-msgstr "水曜日"
+msgstr "水曜"
 
 #: lib/object.php:363
 msgid "Thursday"
-msgstr "木曜日"
+msgstr "木曜"
 
 #: lib/object.php:364
 msgid "Friday"
-msgstr "金曜日"
+msgstr "金曜"
 
 #: lib/object.php:365
 msgid "Saturday"
-msgstr "土曜日"
+msgstr "土曜"
 
 #: lib/object.php:366 templates/settings.php:43
 msgid "Sunday"
-msgstr "日曜日"
+msgstr "日曜"
 
 #: lib/object.php:373
 msgid "events week of month"
@@ -297,7 +322,7 @@ msgstr "終日"
 
 #: templates/calendar.php:12 templates/part.choosecalendar.php:22
 msgid "New Calendar"
-msgstr "新しくカレンダーを作成する"
+msgstr "新しくカレンダーを作成"
 
 #: templates/calendar.php:13
 msgid "Missing fields"
@@ -330,7 +355,7 @@ msgstr "イベント終了時間が開始時間より先です"
 
 #: templates/calendar.php:21
 msgid "There was a database fail"
-msgstr "データベースフェイルがありました"
+msgstr "データベースのエラーがありました"
 
 #: templates/calendar.php:40
 msgid "Week"
@@ -354,15 +379,15 @@ msgstr "カレンダー"
 
 #: templates/calendar.php:67
 msgid "There was a fail, while parsing the file."
-msgstr "ファイルを構文解析する際に失敗しました"
+msgstr "ファイルの構文解析に失敗しました。"
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
-msgstr "アクティブなカレンダーを選択してください"
+msgstr "アクティブなカレンダーを選択"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "あなたのカレンダー"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -371,15 +396,15 @@ msgstr "CalDavへのリンク"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "共有カレンダー"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "共有カレンダーはありません"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "カレンダーを共有する"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -400,7 +425,7 @@ msgstr ""
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr "新しくカレンダーを作成する"
+msgstr "新しいカレンダー"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
@@ -441,23 +466,23 @@ msgstr "エクスポート"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "イベント情報"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "繰り返し"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "アラーム"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "参加者"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "共有"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -469,11 +494,11 @@ msgstr "カテゴリー"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "カテゴリをコンマで区切る"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "カテゴリを編集"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -505,11 +530,11 @@ msgstr "メモ"
 
 #: templates/part.eventform.php:91
 msgid "Description of the Event"
-msgstr "イベントのメモ"
+msgstr "イベントの説明"
 
 #: templates/part.eventform.php:100 templates/part.showevent.php:98
 msgid "Repeat"
-msgstr "繰り返す"
+msgstr "繰り返し"
 
 #: templates/part.eventform.php:107 templates/part.showevent.php:105
 msgid "Advanced"
@@ -546,7 +571,7 @@ msgstr "対象の週を選択する。"
 
 #: templates/part.eventform.php:214 templates/part.showevent.php:212
 msgid "Interval"
-msgstr "周期"
+msgstr "間隔"
 
 #: templates/part.eventform.php:220 templates/part.showevent.php:218
 msgid "End"
@@ -586,19 +611,19 @@ msgstr "カレンダーの取り込みに成功しました"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr "閉じる"
+msgstr "ダイアログを閉じる"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
-msgstr "新しいイベントを作成する"
+msgstr "新しいイベントを作成"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "イベントを閲覧"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "カテゴリが選択されていません"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -606,11 +631,11 @@ msgstr "カテゴリーを選択してください"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "of"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "at"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -618,7 +643,7 @@ msgstr "タイムゾーン"
 
 #: templates/settings.php:31
 msgid "Check always for changes of the timezone"
-msgstr "タイムゾーン変更を常に確認する"
+msgstr "タイムゾーンの変更を常に確認"
 
 #: templates/settings.php:33
 msgid "Timeformat"
@@ -626,40 +651,40 @@ msgstr "時刻のフォーマット"
 
 #: templates/settings.php:35
 msgid "24h"
-msgstr "24時間制"
+msgstr "24h"
 
 #: templates/settings.php:36
 msgid "12h"
-msgstr "12時間制"
+msgstr "12h"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "週の始まり"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
-msgstr "カレンダーのCalDAVシンクアドレス"
+msgstr "CalDAVカレンダーの同期アドレス:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "ユーザ"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "ユーザを選択"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "編集可能"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "グループ"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "グループを選択"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "公開する"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index 6d85c9569f..f48c9cc75b 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ajax/activation.php:19 ajax/updateaddressbook.php:32
 msgid "Error (de)activating addressbook."
-msgstr "電話帳の有効/無効化に失敗しました。"
+msgstr "アドレスブックの有効/無効化に失敗しました。"
 
 #: ajax/addcontact.php:59
 msgid "There was an error adding the contact."
@@ -31,7 +32,7 @@ msgstr "項目の新規追加に失敗しました。"
 
 #: ajax/addproperty.php:52
 msgid "At least one of the address fields has to be filled out."
-msgstr "アドレス項目の１つは記入して下さい。"
+msgstr "住所の項目のうち１つは入力して下さい。"
 
 #: ajax/addproperty.php:62
 msgid "Trying to add duplicate property: "
@@ -43,23 +44,23 @@ msgstr "連絡先の追加に失敗しました。"
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "IDが提供されていません"
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
-msgstr ""
+msgstr "チェックサムの設定エラー。"
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "削除するカテゴリが選択されていません。"
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
-msgstr ""
+msgstr "アドレスブックが見つかりません。"
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "連絡先が見つかりません。"
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
@@ -67,43 +68,40 @@ msgstr ""
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "VCardからIDの抽出エラー: \""
 
 #: ajax/createaddressbook.php:18
 msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "名前を空白にしたままでアドレスブックを追加することはできません。"
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
-msgstr "電話帳の追加に失敗しました。"
+msgstr "アドレスブックの追加に失敗しました。"
 
 #: ajax/createaddressbook.php:30
 msgid "Error activating addressbook."
-msgstr "電話帳の有効化に失敗しました。"
+msgstr "アドレスブックの有効化に失敗しました。"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "連絡先IDは登録されませんでした。"
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "連絡先写真の読み込みエラー。"
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "一時ファイルの保存エラー。"
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
-msgstr ""
+msgstr "写真の読み込みは無効です。"
 
 #: ajax/deletecard.php:37 ajax/saveproperty.php:58
 msgid "id is not set."
-msgstr ""
+msgstr "idが設定されていません。"
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -115,154 +113,313 @@ msgstr "連絡先の削除に失敗しました。"
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "コンタクトIDが見つかりません。"
 
 #: ajax/loadphoto.php:44
 msgid "Missing contact id."
-msgstr ""
+msgstr "コンタクトIDが設定されていません。"
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
+msgstr "写真のパスが登録されていません。"
+
+#: ajax/oc_photo.php:48
+msgid "File doesn't exist:"
+msgstr "ファイルが存在しません:"
+
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "画像の読み込みエラー。"
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/oc_photo.php:51
-msgid "File doesn't exist:"
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
 msgstr ""
 
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
-msgstr ""
+msgstr "要素名が設定されていません。"
 
 #: ajax/saveproperty.php:61
 msgid "checksum is not set."
-msgstr ""
+msgstr "チェックサムが設定されていません。"
 
 #: ajax/saveproperty.php:78
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "vCardの情報が正しくありません。ページを再読み込みしてください: "
 
 #: ajax/saveproperty.php:83
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "連絡先の更新に失敗しました。"
 
 #: ajax/updateaddressbook.php:20
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "空白の名前でアドレスブックを更新することはできません。"
 
 #: ajax/updateaddressbook.php:26
 msgid "Error updating addressbook."
-msgstr "電話帳の更新に失敗しました。"
+msgstr "アドレスブックの更新に失敗しました。"
 
 #: ajax/uploadimport.php:46 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "ストレージへの連絡先のアップロードエラー。"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "エラーはありません。ファイルのアップロードは成功しました"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "アップロードファイルは php.ini 内の upload_max_filesize の制限を超えています"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "アップロードファイルはHTMLフォームで指定された MAX_FILE_SIZE の制限を超えています"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "アップロードファイルは一部分だけアップロードされました"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
-msgstr ""
+msgstr "ファイルはアップロードされませんでした"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
+msgstr "一時保存フォルダが見つかりません"
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "連絡先"
 
-#: lib/app.php:23
-msgid "Addressbook not found."
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: lib/app.php:27
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "連絡先をインポートするVCFファイルをドロップしてください。"
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
+msgid "Addressbook not found."
+msgstr "アドレスブックが見つかりませんでした。"
+
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "これはあなたの電話帳ではありません。"
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "連絡先を見つける事ができません。"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "住所"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "電話番号"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "メールアドレス"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "所属"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "勤務先"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "住居"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "携帯電話"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "TTY TDD"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "音声番号"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
-msgstr ""
+msgstr "メッセージ"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "FAX"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "テレビ電話"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "ポケベル"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
-msgstr ""
+msgstr "インターネット"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "{name}の誕生日"
 
 #: lib/search.php:22
 msgid "Contact"
@@ -278,7 +435,7 @@ msgstr "電話帳"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "アドレスブックを設定"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
@@ -286,12 +443,12 @@ msgstr "新規電話帳"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
-msgstr ""
+msgstr "VCFからインポート"
 
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
-msgstr "CardDAV リンク"
+msgstr "CardDAVリンク"
 
 #: templates/part.chooseaddressbook.rowfields.php:11
 msgid "Download"
@@ -317,7 +474,7 @@ msgstr "連絡先の削除"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
-msgstr ""
+msgstr "写真をドロップしてアップロード"
 
 #: templates/part.contact.php:29
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
@@ -325,35 +482,35 @@ msgstr ""
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "名前の詳細を編集"
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "ニックネーム"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "ニックネームを入力"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
-msgstr "生年月日"
+msgstr "誕生日"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "yyyy-mm-dd"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "グループ"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "コンマでグループを分割"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "グループを編集"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -361,47 +518,47 @@ msgstr "推奨"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "連絡先を追加"
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "メールアドレスを入力"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "アドレスへメールを送る"
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "メールアドレスを削除"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "電話番号を入力"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
-msgstr ""
+msgstr "電話番号を削除"
 
 #: templates/part.contact.php:84
 msgid "View on map"
-msgstr ""
+msgstr "地図で表示"
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
-msgstr ""
+msgstr "住所の詳細を編集"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "ここにメモを追加。"
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "項目を追加"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "プロフィール写真"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -409,27 +566,31 @@ msgstr "電話番号"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "メモ"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
-msgstr ""
+msgstr "現在の写真を削除"
 
 #: templates/part.contactphoto.php:9
 msgid "Edit current photo"
-msgstr ""
+msgstr "現在の写真を編集"
 
 #: templates/part.contactphoto.php:10
 msgid "Upload new photo"
-msgstr ""
+msgstr "新しい写真をアップロード"
 
 #: templates/part.contactphoto.php:11
 msgid "Select photo from ownCloud"
+msgstr "ownCloudから写真を選択"
+
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
-msgstr ""
+msgstr "住所を編集"
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
@@ -443,12 +604,12 @@ msgstr "私書箱"
 #: templates/part.edit_address_dialog.php:29
 #: templates/part.edit_address_dialog.php:32
 msgid "Extended"
-msgstr "拡張番地"
+msgstr "番地2"
 
 #: templates/part.edit_address_dialog.php:35
 #: templates/part.edit_address_dialog.php:38
 msgid "Street"
-msgstr "街路番地"
+msgstr "番地1"
 
 #: templates/part.edit_address_dialog.php:41
 #: templates/part.edit_address_dialog.php:44
@@ -458,7 +619,7 @@ msgstr "都市"
 #: templates/part.edit_address_dialog.php:47
 #: templates/part.edit_address_dialog.php:50
 msgid "Region"
-msgstr "地域"
+msgstr "都道府県"
 
 #: templates/part.edit_address_dialog.php:53
 #: templates/part.edit_address_dialog.php:56
@@ -472,7 +633,7 @@ msgstr "国名"
 
 #: templates/part.edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "カテゴリを編集"
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
@@ -480,7 +641,7 @@ msgstr "追加"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
-msgstr "電話帳"
+msgstr "アドレスブック"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
@@ -488,83 +649,83 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Miss"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Ms"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Mr"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Sir"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Mrs"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "名"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "ミドルネーム"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "姓"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "ストレージへの連絡先のアップロードエラー。"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "J.D."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "M.D."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr "電話帳の新規作成"
+msgstr "アドレスブックの新規作成"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr "電話帳の編集"
+msgstr "アドレスブックを編集"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
@@ -583,82 +744,77 @@ msgid "Submit"
 msgstr "送信"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "取り消し"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "コンタクトファイルをインポート"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "アドレスブックを選択してください"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "新しいアドレスブックを作成"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
+msgstr "新しいアドレスブックの名前"
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "インポート"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
+msgstr "コンタクトをインポート"
 
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
-msgstr ""
+msgstr "インポートするアドレスブックを選択:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
-msgstr ""
+msgstr "HDから選択"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "アドレスブックに連絡先が登録されていません。"
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "連絡先を追加"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "アドレス帳を設定"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "CardDAV同期アドレス"
 
 #: templates/settings.php:4
 msgid "more info"
-msgstr ""
+msgstr "詳細情報"
 
 #: templates/settings.php:6
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "プライマリアドレス（Kontact 他）"
 
 #: templates/settings.php:8
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 0f3163a4e0..f0a07c435a 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -19,14 +20,90 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "アプリケーション名は提供されていません。"
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "追加するカテゴリはありませんか？"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "このカテゴリはすでに存在します: "
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -35,7 +112,7 @@ msgstr "Owncloud のパスワードをリセット"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "ownCloudのパスワードをリセットします"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -43,7 +120,7 @@ msgstr "パスワードをリセットするには次のリンクをクリック
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
-msgstr "パスワードをリセットするリンクがメールで届きます。"
+msgstr "メールでパスワードをリセットするリンクが届きます。"
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Requested"
@@ -51,7 +128,7 @@ msgstr "送信されました"
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Login failed!"
-msgstr "ログインに失敗しました。"
+msgstr "ログインに失敗しました！"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
 #: templates/login.php:9
@@ -60,7 +137,7 @@ msgstr "ユーザ名"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "Request reset"
-msgstr "リセットを要求する。"
+msgstr "リセットを要求します。"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
@@ -100,19 +177,19 @@ msgstr "ヘルプ"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "アクセスが禁止されています"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr "見つけられません"
+msgstr "見つかりません"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "カテゴリを編集"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "追加"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -159,21 +236,21 @@ msgstr "データベースのホスト名"
 msgid "Finish setup"
 msgstr "セットアップを完了します"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "管理下にあるウェブサービス"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "ログアウト"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "設定"
 
 #: templates/login.php:6
 msgid "Lost your password?"
-msgstr "パスワードがわからなくなりましたか？"
+msgstr "パスワードを忘れましたか？"
 
 #: templates/login.php:17
 msgid "remember"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 7da1f666d4..6e34a2dc60 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr "エラーはありません。ファイルのアップロードは成功しました。"
+msgstr "エラーはありません。ファイルのアップロードは成功しました"
 
 #: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
@@ -45,15 +46,67 @@ msgstr "テンポラリフォルダが見つかりません"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "ディスクへの書き込みに失敗しました"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "ファイル"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "サイズ"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "更新日時"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "ファイル操作"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -61,27 +114,27 @@ msgstr "最大アップロードサイズ"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "最大容量: "
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "複数ファイルおよびフォルダのダウンロードに必要"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "ZIP形式のダウンロードを有効にする"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0を指定した場合は無制限"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "ZIPファイルへの最大入力サイズ"
 
 #: templates/index.php:7
 msgid "New"
-msgstr "新規作成"
+msgstr "新規"
 
 #: templates/index.php:9
 msgid "Text file"
@@ -93,7 +146,7 @@ msgstr "フォルダ"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "URL"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -101,7 +154,7 @@ msgstr "アップロード"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "アップロードをキャンセル"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -113,24 +166,12 @@ msgstr "名前"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "共有"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "サイズ"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "更新日時"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "削除"
@@ -143,12 +184,12 @@ msgstr "ファイルサイズが大きすぎます"
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "アップロードしようとしているファイルはサーバで規定された最大サイズを超えています"
+msgstr "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。"
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "ファイルをスキャンしています、しばらくお待ちください。"
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "スキャン中"
diff --git a/l10n/ja_JP/gallery.po b/l10n/ja_JP/gallery.po
index a11164c197..75913ac9a7 100644
--- a/l10n/ja_JP/gallery.po
+++ b/l10n/ja_JP/gallery.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -17,8 +18,48 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "写真"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "設定"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -27,15 +68,11 @@ msgstr "再スキャン"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "停止"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "共有"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -43,16 +80,16 @@ msgstr "戻る"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "承認を取りやめ"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "アルバムを削除しますか？"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "アルバム名を変更する"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "新しいアルバム名"
diff --git a/l10n/ja_JP/media.po b/l10n/ja_JP/media.po
index 95f6294acc..ef58f5e087 100644
--- a/l10n/ja_JP/media.po
+++ b/l10n/ja_JP/media.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +18,19 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "ミュージック"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "再生"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "一時停止"
 
@@ -33,7 +38,7 @@ msgstr "一時停止"
 msgid "Previous"
 msgstr "前"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "次"
 
@@ -47,7 +52,7 @@ msgstr "ミュート解除"
 
 #: templates/music.php:25
 msgid "Rescan Collection"
-msgstr "コレクションを再読み込みする"
+msgstr "コレクションの再スキャン"
 
 #: templates/music.php:37
 msgid "Artist"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index f8340f239a..e0b699f743 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -18,57 +19,76 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "メールアドレスを変更しました"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "無効なリクエストです"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenIDが変更されました"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "無効なリクエストです"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "言語が変更されました"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
-msgstr "Japanese(日本語)"
+msgstr "Japanese (日本語)"
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "ログ"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "もっと"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "アプリを追加"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "アプリを選択してください"
 
 #: templates/apps.php:25
-msgid "-licensed"
-msgstr "権利を保持されています"
+msgid "See application page at apps.owncloud.com"
+msgstr ""
 
-#: templates/apps.php:25
+#: templates/apps.php:26
+msgid "-licensed"
+msgstr "ライセンス"
+
+#: templates/apps.php:26
 msgid "by"
-msgstr "によって"
+msgstr "@"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "ドキュメント"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "大きなファイルを扱うには"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -76,11 +96,11 @@ msgstr "質問してください"
 
 #: templates/help.php:22
 msgid "Problems connecting to help database."
-msgstr "ヘルプ用データベース接続に問題が生じました"
+msgstr "ヘルプデータベースへの接続時に問題が発生しました"
 
 #: templates/help.php:23
 msgid "Go there manually."
-msgstr "手動で移動してください"
+msgstr "手動で移動してください。"
 
 #: templates/help.php:31
 msgid "Answer"
@@ -88,19 +108,19 @@ msgstr "解答"
 
 #: templates/personal.php:8
 msgid "You use"
-msgstr "あなたが使っているのは"
+msgstr "あなたは"
 
 #: templates/personal.php:8
 msgid "of the available"
-msgstr "です。利用可能容量は"
+msgstr "を利用しています。利用可能容量："
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "デスクトップおよびモバイル用の同期クライアント"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "ダウンロード"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -124,11 +144,11 @@ msgstr "表示"
 
 #: templates/personal.php:24
 msgid "Change password"
-msgstr "パスワードを変更する"
+msgstr "パスワードを変更"
 
 #: templates/personal.php:30
 msgid "Email"
-msgstr "メールアドレス"
+msgstr "Email"
 
 #: templates/personal.php:31
 msgid "Your email address"
@@ -136,7 +156,7 @@ msgstr "あなたのメールアドレス"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr "パスワードの回復を有効にするにはメールアドレスを入力してください"
+msgstr "※パスワード回復を有効にするにはメールアドレスの入力が必要です"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
@@ -144,11 +164,11 @@ msgstr "言語"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr "翻訳を手伝う"
+msgstr "翻訳に協力する"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "ファイルマネージャーであなたのownCloudに接続するときはこのアドレスを使用してください"
+msgstr "ファイルマネージャーであなたのownCloudに接続する際は、このアドレスを使用してください"
 
 #: templates/users.php:15 templates/users.php:44
 msgid "Name"
@@ -168,11 +188,11 @@ msgstr "作成"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "デフォルトのクォータサイズ"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "その他"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/ko/calendar.po b/l10n/ko/calendar.po
index a901c6fcce..f433b04414 100644
--- a/l10n/ko/calendar.po
+++ b/l10n/ko/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 19:41+0000\n"
-"Last-Translator: yunhye <limonade83@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,16 +43,40 @@ msgstr "시간대 변경됨"
 msgid "Invalid request"
 msgstr "잘못된 요청"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "달력"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "생일"
diff --git a/l10n/ko/contacts.po b/l10n/ko/contacts.po
index d577b36173..77bb4f1a39 100644
--- a/l10n/ko/contacts.po
+++ b/l10n/ko/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -83,23 +83,20 @@ msgstr "주소록을 추가할 수 없습니다."
 msgid "Error activating addressbook."
 msgstr "주소록을 활성화할 수 없습니다."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "접속 아이디가 기입되지 않았습니다."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "로딩 이미지 오류입니다."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "사진 읽기 오류"
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "임시 파일을 저장하는 동안 오류가 발생했습니다. "
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "로딩 사진이 유효하지 않습니다. "
 
@@ -123,14 +120,46 @@ msgstr "접속 아이디가 없습니다. "
 msgid "Missing contact id."
 msgstr "접속 아이디 분실"
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "파일이 존재하지 않습니다. "
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "로딩 이미지 오류입니다."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -147,7 +176,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "연락처 속성을 업데이트할 수 없습니다."
 
@@ -163,102 +192,229 @@ msgstr "주소록을 업데이트할 수 없습니다."
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "파일이 업로드 되어있지 않습니다"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "임시 폴더 분실"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "연락처"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "주소록을 찾을 수 없습니다."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "내 주소록이 아닙니다."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "연락처를 찾을 수 없습니다."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "주소"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "전화 번호"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "전자 우편"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "조직"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "직장"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "자택"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "휴대폰"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "문자 번호"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "음성 번호"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "메세지"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "팩스 번호"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "영상 번호"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "호출기"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "인터넷"
 
@@ -429,6 +585,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -585,7 +745,7 @@ msgid "Submit"
 msgstr "보내기"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "취소"
 
@@ -613,27 +773,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 79f253c0f7..22330d05c9 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 19:54+0000\n"
-"Last-Translator: yunhye <limonade83@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,6 +31,82 @@ msgstr "추가할 카테고리가 없습니까?"
 msgid "This category already exists: "
 msgstr "이 카테고리는 이미 존재합니다:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Owncloud 암호 재설정"
@@ -161,15 +237,15 @@ msgstr "데이터베이스 호스트"
 msgid "Finish setup"
 msgstr "설치 완료"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "내가 관리하는 웹 서비스"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "로그아웃"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "설정"
 
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 67ff7b80f9..07ce95f06a 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 20:11+0000\n"
-"Last-Translator: yunhye <limonade83@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "임시 폴더가 사라짐"
 msgid "Failed to write to disk"
 msgstr "디스크에 쓰지 못했습니다"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "파일"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "크기"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "수정됨"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "파일 처리"
@@ -121,18 +173,6 @@ msgstr "공유"
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "크기"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "수정됨"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "모두 삭제"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "삭제"
diff --git a/l10n/ko/gallery.po b/l10n/ko/gallery.po
index 301a0a524e..8a972e4ec9 100644
--- a/l10n/ko/gallery.po
+++ b/l10n/ko/gallery.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 19:26+0000\n"
-"Last-Translator: yunhye <limonade83@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,50 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "사진"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "세팅"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "재검색"
@@ -35,10 +75,6 @@ msgstr "정지"
 msgid "Share"
 msgstr "공유"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "세팅"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "뒤로"
diff --git a/l10n/ko/media.po b/l10n/ko/media.po
index 8edb3f9992..5b1734b807 100644
--- a/l10n/ko/media.po
+++ b/l10n/ko/media.po
@@ -7,10 +7,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-04-14 15:40+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "음악"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "재생"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "일시 정지"
 
@@ -34,7 +38,7 @@ msgstr "일시 정지"
 msgid "Previous"
 msgstr "이전"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "다음"
 
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 2c6d73a8a8..1e84863d07 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 20:00+0000\n"
-"Last-Translator: yunhye <limonade83@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,23 +20,38 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "전자 우편 주소 변경됨"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "잘못된 요청"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID 변경됨"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "잘못된 요청"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "언어가 변경되었습니다"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "한국어"
 
@@ -57,10 +72,14 @@ msgid "Select an App"
 msgstr "프로그램 선택"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr " 라이선스 사용"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr " by "
 
diff --git a/l10n/l10n.pl b/l10n/l10n.pl
index 27b14c41be..0f75cc5c7e 100644
--- a/l10n/l10n.pl
+++ b/l10n/l10n.pl
@@ -101,7 +101,7 @@ if( $task eq 'read' ){
 		foreach my $file ( @totranslate ){
 			next if $ignore{$file};
 			my $keyword = ( $file =~ /\.js$/ ? 't:2' : 't');
-			my $language = ( $file =~ /\.js$/ ? 'C' : 'PHP');
+			my $language = ( $file =~ /\.js$/ ? 'Perl' : 'PHP');
 			my $joinexisting = ( -e $output ? '--join-existing' : '');
 			print "    Reading $file\n";
 			`xgettext --output="$output" $joinexisting --keyword=$keyword --language=$language "$file"`;
diff --git a/l10n/lb/calendar.po b/l10n/lb/calendar.po
index e2eb0878a1..8436a2126d 100644
--- a/l10n/lb/calendar.po
+++ b/l10n/lb/calendar.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sim0n@trypill.org>, 2011.
+#   <sim0n@trypill.org>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Keng Kalenner fonnt."
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Keng Evenementer fonnt."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -32,7 +32,7 @@ msgstr "Falschen Kalenner"
 
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
-msgstr ""
+msgstr "Nei Zäitzone:"
 
 #: ajax/settings/settimezone.php:22
 msgid "Timezone changed"
@@ -42,77 +42,101 @@ msgstr "Zäitzon geännert"
 msgid "Invalid request"
 msgstr "Ongülteg Requête"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalenner"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Gebuertsdag"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Geschäftlech"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Uruff"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Clienten"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Liwwerant"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Vakanzen"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Ideeën"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Dag"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Jubiläum"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Meeting"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Aner"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Perséinlech"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Projeten"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Froen"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Aarbecht"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
@@ -146,51 +170,51 @@ msgstr "All Joer"
 
 #: lib/object.php:343
 msgid "never"
-msgstr ""
+msgstr "ni"
 
 #: lib/object.php:344
 msgid "by occurrences"
-msgstr ""
+msgstr "no Virkommes"
 
 #: lib/object.php:345
 msgid "by date"
-msgstr ""
+msgstr "no Datum"
 
 #: lib/object.php:352
 msgid "by monthday"
-msgstr ""
+msgstr "no Mount-Dag"
 
 #: lib/object.php:353
 msgid "by weekday"
-msgstr ""
+msgstr "no Wochendag"
 
 #: lib/object.php:360 templates/settings.php:42
 msgid "Monday"
-msgstr ""
+msgstr "Méindes"
 
 #: lib/object.php:361
 msgid "Tuesday"
-msgstr ""
+msgstr "Dënschdes"
 
 #: lib/object.php:362
 msgid "Wednesday"
-msgstr ""
+msgstr "Mëttwoch"
 
 #: lib/object.php:363
 msgid "Thursday"
-msgstr ""
+msgstr "Donneschdes"
 
 #: lib/object.php:364
 msgid "Friday"
-msgstr ""
+msgstr "Freides"
 
 #: lib/object.php:365
 msgid "Saturday"
-msgstr ""
+msgstr "Samschdes"
 
 #: lib/object.php:366 templates/settings.php:43
 msgid "Sunday"
-msgstr ""
+msgstr "Sonndes"
 
 #: lib/object.php:373
 msgid "events week of month"
@@ -198,75 +222,75 @@ msgstr ""
 
 #: lib/object.php:374
 msgid "first"
-msgstr ""
+msgstr "éischt"
 
 #: lib/object.php:375
 msgid "second"
-msgstr ""
+msgstr "Sekonn"
 
 #: lib/object.php:376
 msgid "third"
-msgstr ""
+msgstr "Drëtt"
 
 #: lib/object.php:377
 msgid "fourth"
-msgstr ""
+msgstr "Féiert"
 
 #: lib/object.php:378
 msgid "fifth"
-msgstr ""
+msgstr "Fënneft"
 
 #: lib/object.php:379
 msgid "last"
-msgstr ""
+msgstr "Läscht"
 
 #: lib/object.php:401
 msgid "January"
-msgstr ""
+msgstr "Januar"
 
 #: lib/object.php:402
 msgid "February"
-msgstr ""
+msgstr "Februar"
 
 #: lib/object.php:403
 msgid "March"
-msgstr ""
+msgstr "Mäerz"
 
 #: lib/object.php:404
 msgid "April"
-msgstr ""
+msgstr "Abrëll"
 
 #: lib/object.php:405
 msgid "May"
-msgstr ""
+msgstr "Mee"
 
 #: lib/object.php:406
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #: lib/object.php:407
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #: lib/object.php:408
 msgid "August"
-msgstr ""
+msgstr "August"
 
 #: lib/object.php:409
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #: lib/object.php:410
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #: lib/object.php:411
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #: lib/object.php:412
 msgid "December"
-msgstr ""
+msgstr "Dezember"
 
 #: lib/object.php:418
 msgid "by events date"
@@ -286,11 +310,11 @@ msgstr ""
 
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #: lib/search.php:40
 msgid "Cal."
-msgstr ""
+msgstr "Cal."
 
 #: templates/calendar.php:11
 msgid "All day"
@@ -363,7 +387,7 @@ msgstr "Wiel aktiv Kalenneren aus"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Deng Kalenneren"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -372,11 +396,11 @@ msgstr "CalDav Link"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Gedeelte Kalenneren"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Keng gedeelten Kalenneren"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
@@ -514,16 +538,16 @@ msgstr "Widderhuelen"
 
 #: templates/part.eventform.php:107 templates/part.showevent.php:105
 msgid "Advanced"
-msgstr ""
+msgstr "Erweidert"
 
 #: templates/part.eventform.php:151 templates/part.showevent.php:149
 msgid "Select weekdays"
-msgstr ""
+msgstr "Wochendeeg auswielen"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
 #: templates/part.showevent.php:162 templates/part.showevent.php:175
 msgid "Select days"
-msgstr ""
+msgstr "Deeg auswielen"
 
 #: templates/part.eventform.php:169 templates/part.showevent.php:167
 msgid "and the events day of year."
@@ -535,11 +559,11 @@ msgstr ""
 
 #: templates/part.eventform.php:190 templates/part.showevent.php:188
 msgid "Select months"
-msgstr ""
+msgstr "Méint auswielen"
 
 #: templates/part.eventform.php:203 templates/part.showevent.php:201
 msgid "Select weeks"
-msgstr ""
+msgstr "Wochen auswielen"
 
 #: templates/part.eventform.php:208 templates/part.showevent.php:206
 msgid "and the events week of year."
@@ -547,19 +571,19 @@ msgstr ""
 
 #: templates/part.eventform.php:214 templates/part.showevent.php:212
 msgid "Interval"
-msgstr ""
+msgstr "Intervall"
 
 #: templates/part.eventform.php:220 templates/part.showevent.php:218
 msgid "End"
-msgstr ""
+msgstr "Enn"
 
 #: templates/part.eventform.php:233 templates/part.showevent.php:231
 msgid "occurrences"
-msgstr ""
+msgstr "Virkommes"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "E Kalenner Fichier importéieren"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -567,11 +591,11 @@ msgstr "Wiel den Kalenner aus"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "E neie Kalenner uleeën"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Numm vum neie Kalenner"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -579,15 +603,15 @@ msgstr "Import"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Importéiert Kalenner"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Kalenner erfollegräich importéiert"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Dialog zoumaachen"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index e30e74d4b7..752a81e3f7 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/contacts.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sim0n@trypill.org>, 2011.
+#   <sim0n@trypill.org>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -82,23 +82,20 @@ msgstr ""
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,14 +119,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -146,7 +175,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -162,102 +191,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Dat do ass net däin Adressbuch."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Konnt den Kontakt net fannen."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adress"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon's Nummer"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Firma"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Aarbecht"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Doheem"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "GSM"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voice"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -267,7 +423,7 @@ msgstr ""
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #: templates/index.php:13
 msgid "Add Contact"
@@ -275,7 +431,7 @@ msgstr "Kontakt bäisetzen"
 
 #: templates/index.php:14
 msgid "Addressbooks"
-msgstr ""
+msgstr "Adressbicher "
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
@@ -283,7 +439,7 @@ msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
-msgstr ""
+msgstr "Neit Adressbuch"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
@@ -292,11 +448,11 @@ msgstr ""
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
-msgstr ""
+msgstr "CardDav Link"
 
 #: templates/part.chooseaddressbook.rowfields.php:11
 msgid "Download"
-msgstr ""
+msgstr "Download"
 
 #: templates/part.chooseaddressbook.rowfields.php:14
 msgid "Edit"
@@ -314,7 +470,7 @@ msgstr ""
 
 #: templates/part.contact.php:13
 msgid "Delete contact"
-msgstr ""
+msgstr "Kontakt läschen"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
@@ -428,13 +584,17 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #: templates/part.edit_address_dialog.php:22
 #: templates/part.edit_address_dialog.php:25
@@ -477,11 +637,11 @@ msgstr ""
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Dobäisetzen"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
-msgstr ""
+msgstr "Adressbuch"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
@@ -561,15 +721,15 @@ msgstr ""
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Neit Adressbuch"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Adressbuch editéieren"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Ugewisene Numm"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
@@ -577,16 +737,16 @@ msgstr ""
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Späicheren"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Fortschécken"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
-msgstr ""
+msgstr "Ofbriechen"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
@@ -612,27 +772,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 8ec45ed94b..0304df227c 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sim0n@trypill.org>, 2011.
+#   <sim0n@trypill.org>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -20,27 +20,103 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Numm vun der Applikatioun ass net uginn."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Keng Kategorie fir bäizesetzen?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Des Kategorie existéiert schonn:"
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Owncloud Passwuert reset"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "ownCloud Passwuert reset"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Benotz folgende Link fir däi Passwuert ze reseten: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -69,7 +145,7 @@ msgstr "Dän Passwuert ass zeréck gesat gin"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Op d'Login Säit"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -101,7 +177,7 @@ msgstr "Hëllef"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Access net erlaabt"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -109,11 +185,11 @@ msgstr "Cloud net fonnt"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Kategorien editéieren"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Bäisetzen"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -160,15 +236,15 @@ msgstr "Datebank Server"
 msgid "Finish setup"
 msgstr "Installatioun ofschléissen"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
-msgstr ""
+msgstr "Web Servicer ënnert denger Kontroll"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Ausloggen"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Astellungen"
 
@@ -182,7 +258,7 @@ msgstr "verhalen"
 
 #: templates/login.php:18
 msgid "Log in"
-msgstr ""
+msgstr "Log dech an"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index b4cea9cd52..5936d91124 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sim0n@trypill.org>, 2011.
+#   <sim0n@trypill.org>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -46,15 +46,67 @@ msgstr "Et feelt en temporären Dossier"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Konnt net op den Disk schreiwen"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Dateien"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Gréisst"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Geännert"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Fichier handling"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -62,39 +114,39 @@ msgstr "Maximum Upload Gréisst "
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "max. méiglech:"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Gett gebraucht fir multi-Fichier an Dossier Downloads."
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "ZIP-download erlaben"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 ass onlimitéiert"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Maximal Gréisst fir ZIP Fichieren"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Nei"
 
 #: templates/index.php:9
 msgid "Text file"
-msgstr ""
+msgstr "Text Fichier"
 
 #: templates/index.php:10
 msgid "Folder"
-msgstr ""
+msgstr "Dossier"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "From URL"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -102,7 +154,7 @@ msgstr "Eroplueden"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Upload ofbriechen"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -114,24 +166,12 @@ msgstr "Numm"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Share"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Eroflueden"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Gréisst"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Geännert"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Läschen"
@@ -148,8 +188,8 @@ msgstr "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei dé
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Fichieren gi gescannt, war weg."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Momentane Scan"
diff --git a/l10n/lb/gallery.po b/l10n/lb/gallery.po
index 8d6b4b465e..933f322891 100644
--- a/l10n/lb/gallery.po
+++ b/l10n/lb/gallery.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <sim0n@trypill.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -17,42 +18,78 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Fotoen"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Astellungen"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
 msgid "Rescan"
-msgstr ""
+msgstr "Nei scannen"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Stop"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Deelen"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Zeréck"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Konfirmatioun läschen"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Wëlls de den Album läschen"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Album Numm änneren"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Neien Numm fir den Album"
diff --git a/l10n/lb/media.po b/l10n/lb/media.po
index 6949c8fad1..cd44542ece 100644
--- a/l10n/lb/media.po
+++ b/l10n/lb/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musek"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Ofspillen"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Paus"
 
@@ -34,7 +38,7 @@ msgstr "Paus"
 msgid "Previous"
 msgstr "Zeréck"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Weider"
 
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 40038bf0bf..533133695f 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sim0n@trypill.org>, 2011.
+#   <sim0n@trypill.org>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -19,57 +19,76 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Ongülteg Requête"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID huet geännert"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Ongülteg Requête"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Sprooch huet geännert"
 
-#: personal.php:39 personal.php:40
-msgid "__language_name__"
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
 msgstr ""
 
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
+msgid "__language_name__"
+msgstr "__language_name__"
+
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Méi"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Setz deng App bei"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Wiel eng Applikatioun aus"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-Lizenséiert"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "vun"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentatioun"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Grouss Fichieren verwalten"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -97,11 +116,11 @@ msgstr "vun den disponibelen"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Desktop an Mobile Syncing Clienten"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Download"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -129,15 +148,15 @@ msgstr "Passwuert änneren"
 
 #: templates/personal.php:30
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #: templates/personal.php:31
 msgid "Your email address"
-msgstr ""
+msgstr "Deng Email Adress"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Gëff eng Email Adress an fir d'Passwuert recovery ze erlaben"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
@@ -145,7 +164,7 @@ msgstr "Sprooch"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr ""
+msgstr "Hëllef iwwersetzen"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -169,15 +188,15 @@ msgstr "Erstellen"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Standard Quota"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Aner"
 
 #: templates/users.php:47
 msgid "Quota"
-msgstr ""
+msgstr "Quota"
 
 #: templates/users.php:80
 msgid "Delete"
diff --git a/l10n/lt_LT/calendar.po b/l10n/lt_LT/calendar.po
index a84045b15a..33742c956e 100644
--- a/l10n/lt_LT/calendar.po
+++ b/l10n/lt_LT/calendar.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Kalendorių nerasta."
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Įvykių nerasta."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -42,79 +42,103 @@ msgstr "Laiko zona pakeista"
 msgid "Invalid request"
 msgstr "Klaidinga užklausa"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalendorius"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Gimtadienis"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Verslas"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Skambučiai"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Klientai"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Vykdytojas"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Išeiginės"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Idėjos"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Kelionė"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Jubiliejus"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Susitikimas"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Kiti"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Asmeniniai"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Projektai"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Klausimai"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Darbas"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "be pavadinimo"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -363,7 +387,7 @@ msgstr "Pasirinkite naudojamus kalendorius"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Jūsų kalendoriai"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -372,15 +396,15 @@ msgstr "CalDav adresas"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Bendri kalendoriai"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Bendrų kalendorių nėra"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Dalintis kalendoriumi"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -442,11 +466,11 @@ msgstr "Eksportuoti"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Informacija"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Pasikartojantis"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
@@ -454,11 +478,11 @@ msgstr ""
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Dalyviai"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Dalintis"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -470,11 +494,11 @@ msgstr "Kategorija"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Atskirkite kategorijas kableliais"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Redaguoti kategorijas"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -535,11 +559,11 @@ msgstr ""
 
 #: templates/part.eventform.php:190 templates/part.showevent.php:188
 msgid "Select months"
-msgstr ""
+msgstr "Pasirinkite mėnesius"
 
 #: templates/part.eventform.php:203 templates/part.showevent.php:201
 msgid "Select weeks"
-msgstr ""
+msgstr "Pasirinkite savaites"
 
 #: templates/part.eventform.php:208 templates/part.showevent.php:206
 msgid "and the events week of year."
@@ -595,11 +619,11 @@ msgstr "Sukurti naują įvykį"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Peržiūrėti įvykį"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "Nepasirinktos jokios katagorijos"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -643,24 +667,24 @@ msgstr "CalDAV kalendoriaus synchronizavimo adresas:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Vartotojai"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "pasirinkti vartotojus"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Redaguojamas"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Grupės"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "pasirinkti grupes"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "viešinti"
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index 089033219d..7191a75575 100644
--- a/l10n/lt_LT/contacts.po
+++ b/l10n/lt_LT/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -82,23 +82,20 @@ msgstr "Klaida pridedant adresų knygą."
 msgid "Error activating addressbook."
 msgstr "Klaida aktyvuojant adresų knygą."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,14 +119,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -146,7 +175,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -162,102 +191,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontaktai"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Tai ne jūsų adresų knygelė."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontaktas nerastas"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresas"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefonas"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "El. paštas"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Darbo"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Namų"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobilusis"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Žinučių"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Balso"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Faksas"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Vaizdo"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pranešimų gaviklis"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -428,6 +584,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -584,7 +744,7 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Atšaukti"
 
@@ -612,27 +772,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 593a254cc5..c2bd15b3ef 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -28,6 +28,82 @@ msgstr ""
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Tokia kategorija jau yra:"
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -36,7 +112,7 @@ msgstr "Owncloud slaptažodžio atkūrimas"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "ownCloud slaptažodžio atkūrimas"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -101,7 +177,7 @@ msgstr "Pagalba"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Priėjimas draudžiamas"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -109,11 +185,11 @@ msgstr "Negalima rasti"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Redaguoti kategorijas"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Pridėti"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -160,15 +236,15 @@ msgstr "Duomenų bazės serveris"
 msgid "Finish setup"
 msgstr "Baigti diegimą"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "jūsų valdomos web paslaugos"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Atsijungti"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Nustatymai"
 
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index ed72ca74ae..b1643eeead 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -46,12 +46,64 @@ msgstr "Nėra laikinojo katalogo"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Nepavyko įrašyti į diską"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Failai"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Dydis"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Pakeista"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -94,7 +146,7 @@ msgstr "Katalogas"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "Iš adreso"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -102,7 +154,7 @@ msgstr "Įkelti"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Atšaukti siuntimą"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -114,24 +166,12 @@ msgstr "Pavadinimas"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Dalintis"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Dydis"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Pakeista"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Ištrinti"
diff --git a/l10n/lt_LT/gallery.po b/l10n/lt_LT/gallery.po
index dfd32c38c3..383e3cf66f 100644
--- a/l10n/lt_LT/gallery.po
+++ b/l10n/lt_LT/gallery.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,8 +18,48 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Nuotraukos"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Nustatymai"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -28,15 +68,11 @@ msgstr "Atnaujinti"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Sustabdyti"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Dalintis"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -44,16 +80,16 @@ msgstr "Atgal"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Išjungti patvirtinimą"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Ar tikrai norite pašalinti albumą"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Keisti albumo pavadinimą"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Naujo albumo pavadinimas"
diff --git a/l10n/lt_LT/media.po b/l10n/lt_LT/media.po
index 8e88b2f52c..c466de33be 100644
--- a/l10n/lt_LT/media.po
+++ b/l10n/lt_LT/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Muzika"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Groti"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pristabdyti"
 
@@ -34,7 +38,7 @@ msgstr "Pristabdyti"
 msgid "Previous"
 msgstr "Atgal"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Kitas"
 
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 208e58cc62..c39cde8a33 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -19,53 +19,72 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "el. paštas pakeistas"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Klaidinga užklausa"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID pakeistas"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Klaidinga užklausa"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Kalba pakeista"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Kalba"
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Žurnalas"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Daugiau"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Pridėti programėlę"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Pasirinkite programą"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licencijuota"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr ""
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentacija"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
@@ -101,7 +120,7 @@ msgstr ""
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Atsisiųsti"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -169,11 +188,11 @@ msgstr "Sukurti"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Numatytoji kvota"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Kita"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/mk/calendar.po b/l10n/mk/calendar.po
index 67387ce375..547898941b 100644
--- a/l10n/mk/calendar.po
+++ b/l10n/mk/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 19:07+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,16 +42,40 @@ msgstr "Временската зона е променета"
 msgid "Invalid request"
 msgstr "Неправилно барање"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Календар"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Роденден"
diff --git a/l10n/mk/contacts.po b/l10n/mk/contacts.po
index e7c5f9c32f..6d30f17cb1 100644
--- a/l10n/mk/contacts.po
+++ b/l10n/mk/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -82,23 +82,20 @@ msgstr "Грешки при додавање на адресарот."
 msgid "Error activating addressbook."
 msgstr "Грешка при активирање на адресарот."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Не беше доставено ИД за контакт."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Грешка во вчитување на слика."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Грешка во читање на контакт фотографија."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Грешка во снимање на привремена датотека."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Фотографијата која се вчитува е невалидна."
 
@@ -122,14 +119,46 @@ msgstr "ИД за контакт недостасува."
 msgid "Missing contact id."
 msgstr "Недостасува ид за контакт."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Не беше поднесена патека за фотографија."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Не постои датотеката:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Грешка во вчитување на слика."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "име за елементот не е поставена."
@@ -146,7 +175,7 @@ msgstr "Информацијата за vCard не е точна. Ве мола
 msgid "Something went FUBAR. "
 msgstr "Нешто се расипа."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Грешка при ажурирање на вредноста за контакт."
 
@@ -162,102 +191,229 @@ msgstr "Грешка при ажурирање на адресарот."
 msgid "Error uploading contacts to storage."
 msgstr "Грешка во снимање на контактите на диск."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Датотеката беше успешно подигната."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Големината на датотеката ја надминува upload_max_filesize директивата во php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Големината на датотеката ја надминува MAX_FILE_SIZE директивата која беше специфицирана во HTML формата"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Датотеката беше само делумно подигната."
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Не беше подигната датотека."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Недостасува привремена папка"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Контакти"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Довлечкај VCF датотека да се внесат контакти."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Адресарот не е најден."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Ова не е во Вашиот адресар."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Контактот неможе да биде најден."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Е-пошта"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Организација"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Работа"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Дома"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Мобилен"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Глас"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Порака"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Пејџер"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Интернет"
 
@@ -428,6 +584,10 @@ msgstr "Подигни нова фотографија"
 msgid "Select photo from ownCloud"
 msgstr "Изберете фотографија од ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Уреди адреса"
@@ -584,7 +744,7 @@ msgid "Submit"
 msgstr "Прати"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Откажи"
 
@@ -612,27 +772,22 @@ msgstr "Внеси"
 msgid "Importing contacts"
 msgstr "Внесување контакти"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Контаките беа внесени успешно"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Дијалог за затварање"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Внеси адресар"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Изберете адресар да се внесе:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Довлечкај VCF датотека да се внесат контакти."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Изберете од хард диск"
 
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 9dfaa37708..c6179ebf6f 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 19:06+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,6 +31,82 @@ msgstr "Нема категорија да се додаде?"
 msgid "This category already exists: "
 msgstr "Оваа категорија веќе постои:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Ресетирање на Owncloud лозинка"
@@ -161,15 +237,15 @@ msgstr "Сервер со база"
 msgid "Finish setup"
 msgstr "Заврши го подесувањето"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "веб сервиси под Ваша контрола"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Одјава"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Поставки"
 
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index ebd16f87ac..e4ad1541e9 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 19:07+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "Не постои привремена папка"
 msgid "Failed to write to disk"
 msgstr "Неуспеав да запишам на диск"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Датотеки"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Големина"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Променето"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Ракување со датотеки"
@@ -121,18 +173,6 @@ msgstr "Сподели"
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Големина"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Променето"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Избриши сѐ"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Избриши"
diff --git a/l10n/mk/gallery.po b/l10n/mk/gallery.po
index a65786dd39..ec987f8a1d 100644
--- a/l10n/mk/gallery.po
+++ b/l10n/mk/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 19:08+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Слики"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Параметри"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Рескенирај"
@@ -34,10 +74,6 @@ msgstr "Стоп"
 msgid "Share"
 msgstr "Сподели"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Параметри"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Назад"
diff --git a/l10n/mk/media.po b/l10n/mk/media.po
index 85aaeb4dda..70a02ba7a6 100644
--- a/l10n/mk/media.po
+++ b/l10n/mk/media.po
@@ -9,10 +9,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-04-27 19:55+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,15 +20,19 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Музика"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Пушти"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Пауза"
 
@@ -36,7 +40,7 @@ msgstr "Пауза"
 msgid "Previous"
 msgstr "Претходно"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Следно"
 
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 04a9829988..3f9e5cf176 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 19:07+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,23 +19,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "е-пошта е сменета"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "неправилно барање"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID сменето"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "неправилно барање"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Јазикот е сменет"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -56,10 +71,14 @@ msgid "Select an App"
 msgstr "Избери аппликација"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licensed"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "од"
 
diff --git a/l10n/ms_MY/calendar.po b/l10n/ms_MY/calendar.po
index 00c9005cda..76a0bb2ba1 100644
--- a/l10n/ms_MY/calendar.po
+++ b/l10n/ms_MY/calendar.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -43,77 +43,101 @@ msgstr "Zon waktu diubah"
 msgid "Invalid request"
 msgstr "Permintaan tidak sah"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Hari lahir"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Perniagaan"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Panggilan"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Klien"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Penghantar"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Cuti"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Idea"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Perjalanan"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Jubli"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Perjumpaan"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Lain"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Peribadi"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Projek"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Soalan"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Kerja"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index 3362ec4541..8c1d5f72ca 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -84,23 +84,20 @@ msgstr "Masalah menambah buku alamat."
 msgid "Error activating addressbook."
 msgstr "Masalah mengaktifkan buku alamat."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -124,14 +121,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -148,7 +177,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Masalah mengemaskini maklumat."
 
@@ -164,102 +193,229 @@ msgstr "Masalah mengemaskini buku alamat."
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Hubungan-hubungan"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Ini bukan buku alamat anda."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Hubungan tidak dapat ditemui"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Alamat"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Emel"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organisasi"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Kerja"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Rumah"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mudah alih"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Teks"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Suara"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Alat Kelui"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -430,6 +586,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -586,7 +746,7 @@ msgid "Submit"
 msgstr "Hantar"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Batal"
 
@@ -614,27 +774,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 027aeb64eb..1e876b63d1 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 10:33+0000\n"
-"Last-Translator: Hadri Hilmi <hadri.hilmi@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,6 +31,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Penetapan kata laluan Owncloud"
@@ -161,15 +237,15 @@ msgstr "Hos pangkalan data"
 msgid "Finish setup"
 msgstr "Setup selesai"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "Perkhidmatan web di bawah kawalan anda"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Log keluar"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Tetapan"
 
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 0cee8ab4ba..3720c95152 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -49,10 +49,62 @@ msgstr "Folder sementara hilang"
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "fail"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Saiz"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Dimodifikasi"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -121,18 +173,6 @@ msgstr ""
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Saiz"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Dimodifikasi"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Padam"
diff --git a/l10n/ms_MY/gallery.po b/l10n/ms_MY/gallery.po
index 312df278be..7dbe8487c1 100644
--- a/l10n/ms_MY/gallery.po
+++ b/l10n/ms_MY/gallery.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,50 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Imbas semula"
@@ -35,10 +75,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Kembali"
diff --git a/l10n/ms_MY/media.po b/l10n/ms_MY/media.po
index 0f564619d9..50375f61fe 100644
--- a/l10n/ms_MY/media.po
+++ b/l10n/ms_MY/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Muzik"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Main"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Jeda"
 
@@ -34,7 +38,7 @@ msgstr "Jeda"
 msgid "Previous"
 msgstr "Sebelum"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Seterus"
 
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 9ef34556dc..9a11c70825 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -20,23 +20,38 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "Emel berubah"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Permintaan tidak sah"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID ditukar"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Permintaan tidak sah"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Bahasa ditukar"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "_nama_bahasa_"
 
@@ -57,10 +72,14 @@ msgid "Select an App"
 msgstr "Pilih aplikasi"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-dilesen"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "oleh"
 
diff --git a/l10n/nb_NO/calendar.po b/l10n/nb_NO/calendar.po
index f9b15afa19..09f790c740 100644
--- a/l10n/nb_NO/calendar.po
+++ b/l10n/nb_NO/calendar.po
@@ -6,14 +6,15 @@
 #   <ajarmund@gmail.com>, 2011, 2012.
 # Arvid Nornes <arvid.nornes@gmail.com>, 2012.
 # Christer Eriksson <post@hc3web.com>, 2012.
+#   <itssmail@yahoo.no>, 2012.
 #   <sondre@nettfrihet.no>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-12 08:30+0000\n"
-"Last-Translator: Arvid Nornes <arvid.nornes@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,16 +46,40 @@ msgstr "Tidssone endret"
 msgid "Invalid request"
 msgstr "Ugyldig forespørsel"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Bursdag"
@@ -642,7 +667,7 @@ msgstr "Ukens første dag"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
-msgstr "Kalender CalDAV synkroniseringsadresse"
+msgstr "Synkroniseringsadresse fo kalender CalDAV:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index 359ffe19b0..3c4fd0d429 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -47,7 +47,7 @@ msgstr "Et problem oppsto med å legge til kontaktfeltet."
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "Ingen ID angitt"
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
@@ -85,29 +85,26 @@ msgstr "Et problem oppsto med å legge til adresseboken."
 msgid "Error activating addressbook."
 msgstr "Et problem oppsto med å aktivere adresseboken."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Klarte ikke å laste bilde."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Klarte ikke å lese kontaktbilde."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Klarte ikke å lagre midlertidig fil."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
-msgstr ""
+msgstr "Bildet som lastes inn er ikke gyldig."
 
 #: ajax/deletecard.php:37 ajax/saveproperty.php:58
 msgid "id is not set."
-msgstr ""
+msgstr "id er ikke satt."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -125,14 +122,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr "Mangler kontakt-id."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Ingen filsti ble lagt inn."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Filen eksisterer ikke:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Klarte ikke å laste bilde."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -149,7 +178,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr "Noe gikk fryktelig galt."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Et problem oppsto med å legge til kontaktfeltet."
 
@@ -165,102 +194,229 @@ msgstr "Et problem oppsto med å oppdatere adresseboken."
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Pust ut, ingen feil. Filen ble lastet opp problemfritt"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Filen du prøvde å laste opp var større enn grensen upload_max_filesize i php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Filen du prøvde å laste opp ble kun delvis lastet opp"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Ingen filer ble lastet opp"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Mangler midlertidig mappe"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Adresseboken ble ikke funnet."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Dette er ikke dine adressebok."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontakten ble ikke funnet."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Hjem"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Svarer"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Melding"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internett"
 
@@ -365,7 +521,7 @@ msgstr "Foretrukket"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Vennligst angi en gyldig e-postadresse."
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
@@ -373,7 +529,7 @@ msgstr "Skriv inn e-postadresse"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "Send e-post til adresse"
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
@@ -413,7 +569,7 @@ msgstr "Telefon"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "Notat"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
@@ -431,6 +587,10 @@ msgstr "Last opp nytt bilde"
 msgid "Select photo from ownCloud"
 msgstr "Velg bilde fra ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Endre adresse"
@@ -548,7 +708,7 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Stipendiat"
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
@@ -584,10 +744,10 @@ msgstr "Lagre"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr "Send inn"
+msgstr "Lagre"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -615,33 +775,28 @@ msgstr "Importer"
 msgid "Importing contacts"
 msgstr "Importerer kontakter"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Kontaktene ble importert uten feil"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Lukk dialog"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Importer adressebok"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Du har ingen kontakter i din adressebok"
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
@@ -649,11 +804,11 @@ msgstr "Ny kontakt"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "Konfigurer adressebøker"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "Synkroniseringsadresse for CardDAV"
 
 #: templates/settings.php:4
 msgid "more info"
@@ -665,4 +820,4 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 567def3384..235bd24a6b 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <ajarmund@gmail.com>, 2011.
+#   <ajarmund@gmail.com>, 2011, 2012.
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel  <i18n@daniel.priv.no>, 2012.
 #   <itssmail@yahoo.no>, 2012.
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 11:04+0000\n"
-"Last-Translator: owncloud <itssmail@yahoo.no>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,14 +23,90 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Applikasjonsnavn ikke angitt."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Ingen kategorier å legge til?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Denne kategorien finnes allerede:"
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -39,7 +115,7 @@ msgstr "OwnCloud passordtilbakestilling"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "Tilbakestill ownCloud passord"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -104,7 +180,7 @@ msgstr "Hjelp"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Tilgang nektet"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -112,11 +188,11 @@ msgstr "Sky ikke funnet"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Rediger kategorier"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Legg til"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -163,15 +239,15 @@ msgstr "Databasevert"
 msgid "Finish setup"
 msgstr "Fullfør oppsetting"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "nettjenester under din kontroll"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Logg ut"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Innstillinger"
 
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index e777435c9d..ced2b12359 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-12 08:20+0000\n"
-"Last-Translator: anjar <ajarmund@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,10 +50,62 @@ msgstr "Mangler en midlertidig mappe"
 msgid "Failed to write to disk"
 msgstr "Klarte ikke å skrive til disk"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Filer"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Størrelse"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Endret"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Filhåndtering"
@@ -122,18 +174,6 @@ msgstr "Del"
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Størrelse"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Endret"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Slett alle"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Slett"
diff --git a/l10n/nb_NO/gallery.po b/l10n/nb_NO/gallery.po
index d112af5146..4ebdedf453 100644
--- a/l10n/nb_NO/gallery.po
+++ b/l10n/nb_NO/gallery.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-12 07:59+0000\n"
-"Last-Translator: anjar <ajarmund@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,10 +20,50 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Bilder"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Innstillinger"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Les inn på nytt"
@@ -36,10 +76,6 @@ msgstr "Stopp"
 msgid "Share"
 msgstr "Del"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Innstillinger"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Tilbake"
diff --git a/l10n/nb_NO/media.po b/l10n/nb_NO/media.po
index 3dbdfecc10..b6d932f877 100644
--- a/l10n/nb_NO/media.po
+++ b/l10n/nb_NO/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musikk"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Spill"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pause"
 
@@ -34,7 +38,7 @@ msgstr "Pause"
 msgid "Previous"
 msgstr "Forrige"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Neste"
 
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 245e72ba7c..0b26d8f505 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 10:18+0000\n"
-"Last-Translator: owncloud <itssmail@yahoo.no>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,23 +22,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "Epostadresse endret"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Ugyldig forespørsel"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID endret"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Ugyldig forespørsel"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Språk endret"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -59,10 +74,14 @@ msgid "Select an App"
 msgstr "Velg en app"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-lisensiert"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "av"
 
diff --git a/l10n/nl/calendar.po b/l10n/nl/calendar.po
index 741d950425..1d7f622b14 100644
--- a/l10n/nl/calendar.po
+++ b/l10n/nl/calendar.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 06:37+0000\n"
-"Last-Translator: Erik Bent <hj.bent.60@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,16 +46,40 @@ msgstr "Tijdzone is veranderd"
 msgid "Invalid request"
 msgstr "Ongeldige aanvraag"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d MMM[ yyyy]{ '&#8212;' d[ MMM] yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Verjaardag"
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index 7118f749a3..af8b706fd4 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 08:05+0000\n"
-"Last-Translator: Erik Bent <hj.bent.60@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,23 +86,20 @@ msgstr "Fout bij het toevoegen van het adresboek."
 msgid "Error activating addressbook."
 msgstr "Fout bij het activeren van het adresboek."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Geen contact ID opgestuurd."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Fout bij laden plaatje."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Lezen van contact foto mislukt."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Tijdelijk bestand opslaan mislukt."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "De geladen foto is niet goed."
 
@@ -126,14 +123,46 @@ msgstr "Contact ID ontbreekt."
 msgid "Missing contact id."
 msgstr "Ontbrekende contact id."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Geen fotopad opgestuurd."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Bestand bestaat niet:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Fout bij laden plaatje."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "onderdeel naam is niet opgegeven."
@@ -150,7 +179,7 @@ msgstr "Informatie over vCard is fout. Herlaad de pagina: "
 msgid "Something went FUBAR. "
 msgstr "Er ging iets totaal verkeerd. "
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Fout bij het updaten van de contacteigenschap."
 
@@ -166,102 +195,229 @@ msgstr "Fout bij het updaten van het adresboek."
 msgid "Error uploading contacts to storage."
 msgstr "Fout bij opslaan van contacten."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "De upload van het bestand is goedgegaan."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Het bestand overschrijdt de upload_max_filesize instelling in php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Het bestand overschrijdt de MAX_FILE_SIZE instelling dat is opgegeven in het HTML formulier"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Het bestand is gedeeltelijk geüpload"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Er is geen bestand geüpload"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Er ontbreekt een tijdelijke map"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contacten"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Sleep een VCF bestand om de contacten te importeren."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Adresboek niet gevonden."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Dit is niet uw adresboek."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Contact kon niet worden gevonden."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organisatie"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Werk"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Thuis"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobiel"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Stem"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Bericht"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pieper"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -432,6 +588,10 @@ msgstr "Upload nieuwe foto"
 msgid "Select photo from ownCloud"
 msgstr "Selecteer foto uit ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Wijzig adres"
@@ -588,7 +748,7 @@ msgid "Submit"
 msgstr "Opslaan"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Anuleren"
 
@@ -616,27 +776,22 @@ msgstr "Importeer"
 msgid "Importing contacts"
 msgstr "Importeren van contacten"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Contacten zijn geïmporteerd"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Sluit venster"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Importeer adresboek"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Selecteer adresboek voor import:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Sleep een VCF bestand om de contacten te importeren."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Selecteer van schijf"
 
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 6a1a51ac9e..1bdd585b7e 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 06:48+0000\n"
-"Last-Translator: Erik Bent <hj.bent.60@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,6 +34,82 @@ msgstr "Geen categorie toevoegen?"
 msgid "This category already exists: "
 msgstr "De categorie bestaat al."
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Reset je ownCloud wachtwoord"
@@ -164,15 +240,15 @@ msgstr "Database server"
 msgid "Finish setup"
 msgstr "Installatie afronden"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "webdiensten die je beheerst"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Afmelden"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Instellingen"
 
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index f32f2338a7..d6e80473b0 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 06:21+0000\n"
-"Last-Translator: Erik Bent <hj.bent.60@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,10 +53,62 @@ msgstr "Een tijdelijke map mist"
 msgid "Failed to write to disk"
 msgstr "Schrijven naar schijf mislukt"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Bestanden"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Bestandsgrootte"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Laatst aangepast"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Bestand"
@@ -125,18 +177,6 @@ msgstr "Delen"
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Bestandsgrootte"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Laatst aangepast"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Alles verwijderen"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Verwijder"
diff --git a/l10n/nl/gallery.po b/l10n/nl/gallery.po
index bea85f9005..8548603b7b 100644
--- a/l10n/nl/gallery.po
+++ b/l10n/nl/gallery.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 06:42+0000\n"
-"Last-Translator: Erik Bent <hj.bent.60@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,50 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Plaatjes"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Instellingen"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Opnieuw doorzoeken"
@@ -35,10 +75,6 @@ msgstr "Stop"
 msgid "Share"
 msgstr "Deel"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Instellingen"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Terug"
diff --git a/l10n/nl/media.po b/l10n/nl/media.po
index 54b630298a..f06251189b 100644
--- a/l10n/nl/media.po
+++ b/l10n/nl/media.po
@@ -9,9 +9,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,15 +20,19 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Muziek"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Afspelen"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pauzeer"
 
@@ -36,7 +40,7 @@ msgstr "Pauzeer"
 msgid "Previous"
 msgstr "Vorige"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Volgende"
 
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 5d66cda928..977be9bdbc 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-15 06:27+0000\n"
-"Last-Translator: Erik Bent <hj.bent.60@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,23 +23,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "mailadres aangepast"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Ongeldig verzoek"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID is aangepast"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Ongeldig verzoek"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Taal aangepast"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Nederlands"
 
@@ -60,10 +75,14 @@ msgid "Select an App"
 msgstr "Selecteer een app"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-gelicentieerd"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "door"
 
diff --git a/l10n/nn_NO/calendar.po b/l10n/nn_NO/calendar.po
index df9ebffb13..420f41350e 100644
--- a/l10n/nn_NO/calendar.po
+++ b/l10n/nn_NO/calendar.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -43,77 +43,101 @@ msgstr "Endra tidssone"
 msgid "Invalid request"
 msgstr "Ugyldig førespurnad"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Bursdag"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Forretning"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Telefonsamtale"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Klientar"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Forsending"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Høgtid"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Idear"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Reise"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Jubileum"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Møte"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Anna"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Personleg"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Prosjekt"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Spørsmål"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index 4f4fe975b0..93385875c2 100644
--- a/l10n/nn_NO/contacts.po
+++ b/l10n/nn_NO/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -83,23 +83,20 @@ msgstr "Eit problem oppstod ved å leggja til adresseboka."
 msgid "Error activating addressbook."
 msgstr "Eit problem oppstod ved aktivering av adresseboka."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -123,14 +120,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -147,7 +176,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Eit problem oppstod ved å endre kontaktfeltet."
 
@@ -163,102 +192,229 @@ msgstr "Eit problem oppstod ved å oppdatere adresseboka."
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kotaktar"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Dette er ikkje di adressebok."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Fann ikkje kontakten."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefonnummer"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Epost"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Heime"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Tale"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Personsøkjar"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -429,6 +585,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -585,7 +745,7 @@ msgid "Submit"
 msgstr "Send"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Kanseller"
 
@@ -613,27 +773,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 316407b172..f8af21ff3e 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -31,6 +31,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Owncloud Passord tilbakestilling"
@@ -161,15 +237,15 @@ msgstr "Databasetenar"
 msgid "Finish setup"
 msgstr "Fullfør oppsettet"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "Vev tjenester under din kontroll"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Logg ut"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Innstillingar"
 
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 606fd10a11..c5cc1159e3 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -49,10 +49,62 @@ msgstr "Manglar ei mellombels mappe"
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Filer"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Storleik"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Endra"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -121,18 +173,6 @@ msgstr ""
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Storleik"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Endra"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Slett"
diff --git a/l10n/nn_NO/gallery.po b/l10n/nn_NO/gallery.po
index 9af44a6fd4..3d4eedd0ef 100644
--- a/l10n/nn_NO/gallery.po
+++ b/l10n/nn_NO/gallery.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Søk på nytt"
@@ -34,10 +74,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Tilbake"
diff --git a/l10n/nn_NO/media.po b/l10n/nn_NO/media.po
index 047e10a6ae..a5f4d0d1d3 100644
--- a/l10n/nn_NO/media.po
+++ b/l10n/nn_NO/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musikk"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Spel"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pause"
 
@@ -34,7 +38,7 @@ msgstr "Pause"
 msgid "Previous"
 msgstr "Førre"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Neste"
 
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index f195f04acf..f8c099c030 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -20,23 +20,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "epost endra"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Ugyldig førespurnad"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID endra"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Ugyldig førespurnad"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Språk endra"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Nynorsk"
 
@@ -57,10 +72,14 @@ msgid "Select an App"
 msgstr "Vel ein applikasjon"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-lisensiert"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "av"
 
diff --git a/l10n/pl/calendar.po b/l10n/pl/calendar.po
index 05a9d3112b..1a335acb35 100644
--- a/l10n/pl/calendar.po
+++ b/l10n/pl/calendar.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Brak kalendarzy"
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Brak wydzarzeń"
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -43,79 +43,103 @@ msgstr "Zmieniono strefę czasową"
 msgid "Invalid request"
 msgstr "Nieprawidłowe żądanie"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalendarz"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Urodziny"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Interesy"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Rozmowy"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Klienci"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Dostawcy"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Święta"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Pomysły"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Podróże"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Jubileusze"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Spotkania"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Inne"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Osobiste"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Projekty"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Pytania"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Zawodowe"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "nienazwany"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -364,7 +388,7 @@ msgstr "Wybór aktywnych kalendarzy"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Twoje kalendarze"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -373,15 +397,15 @@ msgstr "Wyświetla odnośnik CalDAV"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Współdzielone kalendarze"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Brak współdzielonych kalendarzy"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Współdziel kalendarz"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -398,7 +422,7 @@ msgstr "Usuwa kalendarz"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "współdzielisz z"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -443,23 +467,23 @@ msgstr "Wyeksportuj"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Informacja o wydarzeniach"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Powtarzanie"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Alarm"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Uczestnicy"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Współdziel"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -471,11 +495,11 @@ msgstr "Kategoria"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Oddziel kategorie przecinkami"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Edytuj kategorie"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -596,11 +620,11 @@ msgstr "Tworzenie nowego wydarzenia"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Zobacz wydarzenie"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "nie zaznaczono kategorii"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -608,11 +632,11 @@ msgstr "Wybierz kategorię"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "z"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "w"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -636,7 +660,7 @@ msgstr "12h"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "Pierwszy dzień tygodnia"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
@@ -644,24 +668,24 @@ msgstr "Adres synchronizacji kalendarza CalDAV:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Użytkownicy"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "wybierz użytkowników"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Edytowalne"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Grupy"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "wybierz grupy"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "uczyń publicznym"
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index 6c063d3d2e..2219380006 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/contacts.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Bartek  <bart.p.pl@gmail.com>, 2012.
+# Cyryl Sochacki <>, 2012.
 # Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
 # Piotr Sokół <psokol@jabster.pl>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +39,7 @@ msgstr "Należy wypełnić przynajmniej jedno pole adresu."
 
 #: ajax/addproperty.php:62
 msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "Próba dodania z duplikowanej właściwości:"
 
 #: ajax/addproperty.php:120
 msgid "Error adding contact property."
@@ -46,35 +47,35 @@ msgstr "Błąd dodawania elementu."
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "Brak opatrzonego ID "
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Błąd ustawień sumy kontrolnej"
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nie zaznaczono kategorii do usunięcia"
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
-msgstr ""
+msgstr "Nie znaleziono książek adresowych"
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "Nie znaleziono kontaktów."
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
-msgstr ""
+msgstr "Brak ID"
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "Wystąpił błąd podczas przetwarzania VCard ID: \""
 
 #: ajax/createaddressbook.php:18
 msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "Nie można dodać książki adresowej z pusta nazwą"
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
@@ -84,29 +85,26 @@ msgstr "Błąd dodawania książki adresowej."
 msgid "Error activating addressbook."
 msgstr "Błąd aktywowania książki adresowej."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "ID kontaktu nie został utworzony."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Błąd odczytu zdjęcia kontaktu."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Wystąpił błąd podczas zapisywania pliku tymczasowego."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
-msgstr ""
+msgstr "Wczytywane zdjęcie nie jest poprawne."
 
 #: ajax/deletecard.php:37 ajax/saveproperty.php:58
 msgid "id is not set."
-msgstr ""
+msgstr "id nie ustawione."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -118,43 +116,75 @@ msgstr "Błąd usuwania elementu."
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "Brak kontaktu id."
 
 #: ajax/loadphoto.php:44
 msgid "Missing contact id."
-msgstr ""
+msgstr "Brak kontaktu id."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
+msgstr "Ścieżka do zdjęcia nie została podana."
+
+#: ajax/oc_photo.php:48
+msgid "File doesn't exist:"
+msgstr "Plik nie istnieje:"
+
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Błąd ładowania obrazu."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/oc_photo.php:51
-msgid "File doesn't exist:"
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
 msgstr ""
 
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
-msgstr ""
+msgstr "nazwa elementu nie jest ustawiona."
 
 #: ajax/saveproperty.php:61
 msgid "checksum is not set."
-msgstr ""
+msgstr "checksum-a nie ustawiona"
 
 #: ajax/saveproperty.php:78
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:"
 
 #: ajax/saveproperty.php:83
 msgid "Something went FUBAR. "
-msgstr ""
+msgstr "Gdyby coś poszło FUBAR."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Błąd uaktualniania elementu."
 
 #: ajax/updateaddressbook.php:20
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "Nie można zaktualizować książki adresowej z pustą nazwą."
 
 #: ajax/updateaddressbook.php:26
 msgid "Error updating addressbook."
@@ -162,110 +192,237 @@ msgstr "Błąd uaktualniania książki adresowej."
 
 #: ajax/uploadimport.php:46 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Wystąpił błąd podczas wysyłania kontaktów do magazynu."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Nie było błędów, plik wyczytano poprawnie."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Załadowany plik przekracza wielkość upload_max_filesize w php.ini "
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Wczytywany plik przekracza wielkość MAX_FILE_SIZE, która została określona w formularzu HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Załadowany plik tylko częściowo został wysłany."
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Plik nie został załadowany"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
+msgstr "Brak folderu tymczasowego"
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: lib/app.php:23
-msgid "Addressbook not found."
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: lib/app.php:27
-msgid "This is not your addressbook."
-msgstr "To nie jest twoja książka adresowa."
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
 
-#: lib/app.php:38
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Upuść plik VCF do importu kontaktów."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
+msgid "Addressbook not found."
+msgstr "Nie znaleziono książki adresowej"
+
+#: lib/app.php:34
+msgid "This is not your addressbook."
+msgstr "To nie jest Twoja książka adresowa."
+
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Nie można odnaleźć kontaktu."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizacja"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Praca"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Dom"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Komórka"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Połączenie tekstowe"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Połączenie głosowe"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
-msgstr ""
+msgstr "Wiadomość"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Połączenie wideo"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
-msgstr ""
+msgstr "Internet"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "{name} Urodzony"
 
 #: lib/search.php:22
 msgid "Contact"
@@ -281,7 +438,7 @@ msgstr "Książki adresowe"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Konfiguruj książkę adresową"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
@@ -289,7 +446,7 @@ msgstr "Nowa książka adresowa"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
-msgstr ""
+msgstr "Importuj z VFC"
 
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
@@ -320,23 +477,23 @@ msgstr "Usuwa kontakt"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
-msgstr ""
+msgstr "Upuść fotografię aby załadować"
 
 #: templates/part.contact.php:29
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+msgstr "Format niestandardowy, krótkie nazwy, imię i nazwisko, Odwracać lub Odwrócić z przecinkiem"
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "Edytuj szczegóły nazwy"
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "Nazwa"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "Wpisz nazwę"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
@@ -344,19 +501,19 @@ msgstr "Urodziny"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "dd-mm-rrrr"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "Grupy"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "Oddziel grupy przecinkami"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "Edytuj grupy"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -364,47 +521,47 @@ msgstr "Preferowane"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Określ prawidłowy adres e-mail."
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "Wpisz adres email"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "Mail na adres"
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "Usuń adres mailowy"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "Wpisz numer telefonu"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
-msgstr ""
+msgstr "Usuń numer telefonu"
 
 #: templates/part.contact.php:84
 msgid "View on map"
-msgstr ""
+msgstr "Zobacz na mapie"
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
-msgstr ""
+msgstr "Edytuj szczegóły adresu"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "Dodaj notatkę tutaj."
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "Dodaj pole"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "Zdjęcie profilu"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -412,27 +569,31 @@ msgstr "Telefon"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "Uwaga"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
-msgstr ""
+msgstr "Usuń aktualne zdjęcie"
 
 #: templates/part.contactphoto.php:9
 msgid "Edit current photo"
-msgstr ""
+msgstr "Edytuj aktualne zdjęcie"
 
 #: templates/part.contactphoto.php:10
 msgid "Upload new photo"
-msgstr ""
+msgstr "Wczytaj nowe zdjęcie"
 
 #: templates/part.contactphoto.php:11
 msgid "Select photo from ownCloud"
+msgstr "Wybierz zdjęcie z ownCloud"
+
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
-msgstr ""
+msgstr "Edytuj adres"
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
@@ -475,7 +636,7 @@ msgstr "Kraj"
 
 #: templates/part.edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Edytuj kategorie"
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
@@ -487,79 +648,79 @@ msgstr "Książka adresowa"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Prefiksy Hon."
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Panna"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Ms"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Pan"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Sir"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Pani"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Podaj imię"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Dodatkowe nazwy"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Nazwa rodziny"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "Sufiksy Hon."
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "J.D."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "M.D."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -586,82 +747,77 @@ msgid "Submit"
 msgstr "Potwierdź"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Anuluj"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "Importuj plik z kontaktami"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "Proszę wybrać książkę adresową"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "utwórz nową książkę adresową"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
+msgstr "Nazwa nowej książki adresowej"
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Import"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
+msgstr "importuj kontakty"
 
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
-msgstr ""
+msgstr "Zaznacz książkę adresową do importu do:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
-msgstr ""
+msgstr "Wybierz z HD"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Nie masz żadnych kontaktów w swojej książce adresowej."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Dodaj kontakt"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "Konfiguruj książkę adresową"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "adres do synchronizacji CardDAV"
 
 #: templates/settings.php:4
 msgid "more info"
-msgstr ""
+msgstr "więcej informacji"
 
 #: templates/settings.php:6
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Pierwszy adres"
 
 #: templates/settings.php:8
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 282ad5585f..905b545290 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -11,9 +11,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -24,14 +24,90 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Brak nazwy dla aplikacji"
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Brak kategorii"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Ta kategoria już istnieje"
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -40,7 +116,7 @@ msgstr "Resetowanie hasła"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "restart hasła"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -105,7 +181,7 @@ msgstr "Pomoc"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Dostęp zabroniony"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -113,11 +189,11 @@ msgstr "Nie odnaleziono chmury"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Edytuj kategorię"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Dodaj"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -164,15 +240,15 @@ msgstr "Komputer bazy danych"
 msgid "Finish setup"
 msgstr "Zakończ konfigurowanie"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "usługi internetowe pod kontrolą"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Wylogowuje użytkownika"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Ustawienia"
 
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 265c64e67d..b37c9903ee 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyryl Sochacki <>, 2012.
 # Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
 #   <mosslar@gmail.com>, 2011.
 # Piotr Sokół <psokol@jabster.pl>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +49,67 @@ msgstr "Brak katalogu tymczasowego"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Błąd zapisu na dysk"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Pliki"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Rozmiar"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Czas modyfikacji"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Zarządzanie plikami"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -64,23 +117,23 @@ msgstr "Maksymalny rozmiar wysyłanego pliku"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "max. możliwych"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Wymagany do pobierania wielu plików i folderów"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Włącz pobieranie ZIP-paczki"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 jest nielimitowane"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Maksymalna wielkość pliku wejściowego ZIP "
 
 #: templates/index.php:7
 msgid "New"
@@ -96,7 +149,7 @@ msgstr "Katalog"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "Z adresu"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -104,7 +157,7 @@ msgstr "Prześlij"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Przestań wysyłać"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -116,24 +169,12 @@ msgstr "Nazwa"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Współdziel"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Pobiera element"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Rozmiar"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Czas modyfikacji"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Usuwa element"
@@ -150,8 +191,8 @@ msgstr "Pliki które próbujesz przesłać, przekraczają maksymalną, dopuszcza
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Skanowanie plików, proszę czekać."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Aktualnie skanowane"
diff --git a/l10n/pl/gallery.po b/l10n/pl/gallery.po
index daa6a4ac54..b53b2545d6 100644
--- a/l10n/pl/gallery.po
+++ b/l10n/pl/gallery.po
@@ -9,9 +9,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,8 +20,48 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Zdjęcia"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Ustawienia"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -30,15 +70,11 @@ msgstr "Przeszukaj"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Stop"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Współdziel"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -46,16 +82,16 @@ msgstr "Wróć"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Usuń potwierdzenie"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Czy chcesz usunąć album"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Zmień nazwę albumu"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Nowa nazwa albumu"
diff --git a/l10n/pl/media.po b/l10n/pl/media.po
index 74433240bf..d8f1ee9e41 100644
--- a/l10n/pl/media.po
+++ b/l10n/pl/media.po
@@ -9,10 +9,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-04-16 21:16+0000\n"
-"Last-Translator: Piotr Sokół <psokol@jabster.pl>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,15 +20,19 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Muzyka"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Odtwarzaj"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Wstrzymaj"
 
@@ -36,7 +40,7 @@ msgstr "Wstrzymaj"
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Następny"
 
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 7eb252abe6..25b7eda775 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -12,9 +12,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -24,57 +24,76 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "zmieniono adres e-mail"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Nieprawidłowe żądanie"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "Zmieniono OpenID"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Nieprawidłowe żądanie"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Język zmieniony"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Polski"
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Więcej"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Dodaj aplikacje"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Zaznacz aplikacje"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licencjonowany"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "przez"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentacja"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Zarządzanie dużymi plikami"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -102,11 +121,11 @@ msgstr "z dostępnych"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Klienci synchronizacji"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Ściągnij"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -174,11 +193,11 @@ msgstr "Utwórz"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Domyślny udział"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Inne"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/pt_BR/calendar.po b/l10n/pt_BR/calendar.po
index 5283c3162a..9d5c771269 100644
--- a/l10n/pt_BR/calendar.po
+++ b/l10n/pt_BR/calendar.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 19:59+0000\n"
-"Last-Translator: Guilherme Maluf Balzana <guimalufb@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,16 +44,40 @@ msgstr "Fuso horário alterado"
 msgid "Invalid request"
 msgstr "Pedido inválido"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendário"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Aniversário"
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index 1da3cea497..f2be42ae68 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 16:43+0000\n"
-"Last-Translator: Guilherme Maluf Balzana <guimalufb@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,23 +84,20 @@ msgstr "Erro ao adicionar agenda."
 msgid "Error activating addressbook."
 msgstr "Erro ao ativar agenda."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Nenhum ID do contato foi submetido."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Erro ao carregar imagem."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Erro de leitura na foto do contato."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Erro ao salvar arquivo temporário."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Foto carregada não é válida."
 
@@ -124,14 +121,46 @@ msgstr "ID do contato está faltando."
 msgid "Missing contact id."
 msgstr "Faltando ID do contato."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Nenhum caminho para foto foi submetido."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Arquivo não existe:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Erro ao carregar imagem."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "nome do elemento não definido."
@@ -148,7 +177,7 @@ msgstr "Informação sobre vCard incorreto. Por favor, recarregue a página:"
 msgid "Something went FUBAR. "
 msgstr "Something went FUBAR. "
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedades do contato."
 
@@ -164,108 +193,235 @@ msgstr "Erro ao atualizar agenda."
 msgid "Error uploading contacts to storage."
 msgstr "Erro enviando contatos para armazenamento."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Arquivo enviado com sucesso"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "O arquivo enviado excede a diretiva upload_max_filesize em php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "O arquivo carregado excede o argumento MAX_FILE_SIZE especificado no formulário HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "O arquivo foi parcialmente carregado"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Nenhum arquivo carregado"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
+msgstr "Diretório temporário não encontrado"
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contatos"
 
-#: lib/app.php:23
-msgid "Addressbook not found."
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: lib/app.php:27
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Arraste um arquivo VCF para importar contatos."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
+msgid "Addressbook not found."
+msgstr "Lista de endereços não encontrado."
+
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Esta não é a sua agenda de endereços."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Contato não pôde ser encontrado."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Endereço"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefone"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organização"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Trabalho"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Home"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Móvel"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
-msgstr ""
+msgstr "Mensagem"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
-msgstr ""
+msgstr "Internet"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "Aniversário de {name}"
 
 #: lib/search.php:22
 msgid "Contact"
@@ -277,11 +433,11 @@ msgstr "Adicionar Contato"
 
 #: templates/index.php:14
 msgid "Addressbooks"
-msgstr "Agendas"
+msgstr "Agendas de Endereço"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Configurar Livro de Endereços"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
@@ -289,7 +445,7 @@ msgstr "Nova agenda"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
-msgstr ""
+msgstr "Importar de VCF"
 
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
@@ -320,23 +476,23 @@ msgstr "Apagar contato"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
-msgstr ""
+msgstr "Arraste a foto para ser carregada"
 
 #: templates/part.contact.php:29
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+msgstr "Formato personalizado, Nome curto, Nome completo, Inverter ou Inverter com vírgula"
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "Editar detalhes do nome"
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "Apelido"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "Digite o apelido"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
@@ -344,19 +500,19 @@ msgstr "Aniversário"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "dd-mm-aaaa"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "Grupos"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "Separe grupos por virgula"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "Editar grupos"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -364,47 +520,47 @@ msgstr "Preferido"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Por favor, especifique um email válido."
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "Digite um endereço de email"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "Correio para endereço"
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "Remover endereço de email"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "Digite um número de telefone"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
-msgstr ""
+msgstr "Remover número de telefone"
 
 #: templates/part.contact.php:84
 msgid "View on map"
-msgstr ""
+msgstr "Visualizar no mapa"
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
-msgstr ""
+msgstr "Editar detalhes de endereço"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "Adicionar notas"
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "Adicionar campo"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "Imagem do Perfil"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -412,27 +568,31 @@ msgstr "Telefone"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
-msgstr ""
+msgstr "Deletar imagem atual"
 
 #: templates/part.contactphoto.php:9
 msgid "Edit current photo"
-msgstr ""
+msgstr "Editar imagem atual"
 
 #: templates/part.contactphoto.php:10
 msgid "Upload new photo"
-msgstr ""
+msgstr "Carregar nova foto"
 
 #: templates/part.contactphoto.php:11
 msgid "Select photo from ownCloud"
+msgstr "Selecionar foto do OwnCloud"
+
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
-msgstr ""
+msgstr "Editar endereço"
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
@@ -475,7 +635,7 @@ msgstr "País"
 
 #: templates/part.edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Editar categorias"
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
@@ -483,91 +643,91 @@ msgstr "Adicionar"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
-msgstr "Agenda"
+msgstr "Agenda de Endereço"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Exmo. Prefixos "
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Senhorita"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Srta."
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Sr."
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Senhor"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Sra."
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Primeiro Nome"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Segundo Nome"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Sobrenome"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "Exmo. Sufixos"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "J.D."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "M.D."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr "Nova agenda"
+msgstr "Nova Agenda de Endereço"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr "Editar agenda"
+msgstr "Editar Agenda de Endereço"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
@@ -586,82 +746,77 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "Importar arquivos de contato."
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "Por favor, selecione uma agenda de endereços"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "Criar nova agenda de endereços"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
+msgstr "Nome da nova agenda de endereços"
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Importar"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
+msgstr "Importar contatos"
 
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
-msgstr ""
+msgstr "Selecione agenda de endereços para importar ao destino:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
-msgstr ""
+msgstr "Selecione do disco rigído"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Voce não tem contatos em sua agenda de endereços."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Adicionar contatos"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "Configurar agenda de endereços"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "Sincronizando endereços CardDAV"
 
 #: templates/settings.php:4
 msgid "more info"
-msgstr ""
+msgstr "leia mais"
 
 #: templates/settings.php:6
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Endereço primário(Kontact et al)"
 
 #: templates/settings.php:8
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index be83e6bfe4..0c9e514fdb 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 19:50+0000\n"
-"Last-Translator: Guilherme Maluf Balzana <guimalufb@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,6 +33,82 @@ msgstr "Nenhuma categoria adicionada?"
 msgid "This category already exists: "
 msgstr "Essa categoria já existe"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Mudar senha do Owncloud"
@@ -163,15 +239,15 @@ msgstr "Banco de dados do host"
 msgid "Finish setup"
 msgstr "Concluir configuração"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "web services sob seu controle"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Sair"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Configurações"
 
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 588b33fb73..ef9cf274d9 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-14 16:18+0000\n"
-"Last-Translator: Guilherme Maluf Balzana <guimalufb@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,10 +50,62 @@ msgstr "Pasta temporária não encontrada"
 msgid "Failed to write to disk"
 msgstr "Falha ao escrever no disco"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Arquivos"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Tamanho"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modificado"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Tratamento de Arquivo"
@@ -122,18 +174,6 @@ msgstr "Compartilhar"
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Tamanho"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modificado"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Deletar Tudo"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Excluir"
diff --git a/l10n/pt_BR/gallery.po b/l10n/pt_BR/gallery.po
index da803b0599..1c68432fb0 100644
--- a/l10n/pt_BR/gallery.po
+++ b/l10n/pt_BR/gallery.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-12 00:52+0000\n"
-"Last-Translator: Van Der Fran <transifex@vanderland.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,50 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Fotos"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Configuração"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Atualizar"
@@ -35,10 +75,6 @@ msgstr "Parar"
 msgid "Share"
 msgstr "Compartilhar"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Configuração"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Voltar"
diff --git a/l10n/pt_BR/media.po b/l10n/pt_BR/media.po
index 76b0263bb5..7791374917 100644
--- a/l10n/pt_BR/media.po
+++ b/l10n/pt_BR/media.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -19,15 +19,19 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Música"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Tocar"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pausa"
 
@@ -35,7 +39,7 @@ msgstr "Pausa"
 msgid "Previous"
 msgstr "Anterior"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Próximo"
 
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 5043a358e3..88a8425439 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 20:01+0000\n"
-"Last-Translator: Guilherme Maluf Balzana <guimalufb@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,23 +22,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "email Alterado"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Pedido inválido"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "Mudou OpenID"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Pedido inválido"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Mudou Idioma"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Português"
 
@@ -59,10 +74,14 @@ msgid "Select an App"
 msgstr "Selecione uma Aplicação"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licenciados"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "por"
 
diff --git a/l10n/pt_PT/calendar.po b/l10n/pt_PT/calendar.po
index 5d7d95b0ab..02385945ce 100644
--- a/l10n/pt_PT/calendar.po
+++ b/l10n/pt_PT/calendar.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <helder.meneses@gmail.com>, 2011.
+# Helder Meneses <helder.meneses@gmail.com>, 2012.
 #   <rjgpp.1994@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +22,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Nenhum calendário encontrado."
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Nenhum evento encontrado."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -43,79 +44,103 @@ msgstr "Zona horária alterada"
 msgid "Invalid request"
 msgstr "Pedido inválido"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendário"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Dia de anos"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Negócio"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Telefonar"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Clientes"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Entregar"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Férias"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Ideias"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Jornada"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Jublieu"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Encontro"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Outro"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Pessoal"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Projetos"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Perguntas"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Trabalho"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "não definido"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -364,7 +389,7 @@ msgstr "Escolhe calendários ativos"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Os seus calendários"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -373,15 +398,15 @@ msgstr "Endereço CalDav"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Calendários partilhados"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Nenhum calendário partilhado"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Partilhar calendário"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -398,7 +423,7 @@ msgstr "Apagar"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "Partilhado consigo por"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -443,23 +468,23 @@ msgstr "Exportar"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Informação do evento"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Repetição"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Alarme"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Participantes"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Partilhar"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -471,11 +496,11 @@ msgstr "Categoria"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Separe categorias por virgulas"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Editar categorias"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -596,11 +621,11 @@ msgstr "Criar novo evento"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Ver um evento"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "Nenhuma categoria seleccionada"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -608,11 +633,11 @@ msgstr "Selecionar categoria"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "de"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "em"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -636,7 +661,7 @@ msgstr "12h"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "Primeiro dia da semana"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
@@ -644,24 +669,24 @@ msgstr "Endereço de sincronização CalDav do calendário"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Utilizadores"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "Selecione utilizadores"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Editavel"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Grupos"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "Selecione grupos"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "Tornar público"
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index 908fc259a2..4b0f48cbee 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgstr "Pelo menos um dos campos de endereço precisa de estar preenchido"
 
 #: ajax/addproperty.php:62
 msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "A tentar adicionar propriedade duplicada: "
 
 #: ajax/addproperty.php:120
 msgid "Error adding contact property."
@@ -46,35 +46,35 @@ msgstr "Erro ao adicionar propriedade do contato"
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "Nenhum ID inserido"
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Erro a definir checksum."
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nenhuma categoria selecionada para eliminar."
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
-msgstr ""
+msgstr "Nenhum livro de endereços encontrado."
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "Nenhum contacto encontrado."
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
-msgstr ""
+msgstr "Falta ID"
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "Erro a analisar VCard para o ID: \""
 
 #: ajax/createaddressbook.php:18
 msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "Não é possivel adicionar Livro de endereços com nome vazio."
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
@@ -84,29 +84,26 @@ msgstr "Erro ao adicionar livro de endereços"
 msgid "Error activating addressbook."
 msgstr "Erro ao ativar livro de endereços"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "Nenhum ID de contacto definido."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Erro a ler a foto do contacto."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Erro a guardar ficheiro temporário."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
-msgstr ""
+msgstr "A foto carregada não é valida."
 
 #: ajax/deletecard.php:37 ajax/saveproperty.php:58
 msgid "id is not set."
-msgstr ""
+msgstr "id não está definido"
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -118,43 +115,75 @@ msgstr "Erro ao apagar propriedade do contato"
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "Falta o ID do contacto."
 
 #: ajax/loadphoto.php:44
 msgid "Missing contact id."
-msgstr ""
+msgstr "Falta o ID do contacto."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
+msgstr "Nenhum caminho da foto definido."
+
+#: ajax/oc_photo.php:48
+msgid "File doesn't exist:"
+msgstr "O ficheiro não existe:"
+
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Erro a carregar a imagem."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/oc_photo.php:51
-msgid "File doesn't exist:"
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
 msgstr ""
 
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
-msgstr ""
+msgstr "o nome do elemento não está definido."
 
 #: ajax/saveproperty.php:61
 msgid "checksum is not set."
-msgstr ""
+msgstr "Checksum não está definido."
 
 #: ajax/saveproperty.php:78
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "A informação sobre o VCard está incorrecta. Por favor refresque a página: "
 
 #: ajax/saveproperty.php:83
 msgid "Something went FUBAR. "
-msgstr ""
+msgstr "Algo provocou um FUBAR. "
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedade do contato"
 
 #: ajax/updateaddressbook.php:20
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "Não é possivel actualizar o livro de endereços com o nome vazio."
 
 #: ajax/updateaddressbook.php:26
 msgid "Error updating addressbook."
@@ -162,110 +191,237 @@ msgstr "Erro a atualizar o livro de endereços"
 
 #: ajax/uploadimport.php:46 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Erro a carregar os contactos para o armazenamento."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Não ocorreu erros, o ficheiro foi submetido com sucesso"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Nenhum ficheiro foi submetido"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contactos"
 
-#: lib/app.php:23
-msgid "Addressbook not found."
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: lib/app.php:27
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
+msgid "Addressbook not found."
+msgstr "Livro de endereços não encontrado."
+
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Esta não é a sua lista de contactos"
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "O contacto não foi encontrado"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Morada"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefone"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organização"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Emprego"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Telemovel"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
-msgstr ""
+msgstr "Mensagem"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
-msgstr ""
+msgstr "Internet"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "Aniversário de {name}"
 
 #: lib/search.php:22
 msgid "Contact"
@@ -281,7 +437,7 @@ msgstr "Livros de endereços"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Configurar livros de endereços"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
@@ -289,7 +445,7 @@ msgstr "Novo livro de endereços"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
-msgstr ""
+msgstr "Importar de VCF"
 
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
@@ -328,15 +484,15 @@ msgstr ""
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "Editar detalhes do nome"
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "Alcunha"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "Introduza alcunha"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
@@ -344,19 +500,19 @@ msgstr "Aniversário"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "dd-mm-aaaa"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "Grupos"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "Separe os grupos usando virgulas"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "Editar grupos"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -364,47 +520,47 @@ msgstr "Preferido"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Por favor indique um endereço de correio válido"
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "Introduza endereço de email"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "Enviar correio para o endereço"
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "Eliminar o endereço de correio"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "Insira o número de telefone"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
-msgstr ""
+msgstr "Eliminar o número de telefone"
 
 #: templates/part.contact.php:84
 msgid "View on map"
-msgstr ""
+msgstr "Ver no mapa"
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
-msgstr ""
+msgstr "Editar os detalhes do endereço"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "Insira notas aqui."
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "Adicionar campo"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "Foto do perfil"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -412,15 +568,15 @@ msgstr "Telefone"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
-msgstr ""
+msgstr "Eliminar a foto actual"
 
 #: templates/part.contactphoto.php:9
 msgid "Edit current photo"
-msgstr ""
+msgstr "Editar a foto actual"
 
 #: templates/part.contactphoto.php:10
 msgid "Upload new photo"
@@ -428,11 +584,15 @@ msgstr ""
 
 #: templates/part.contactphoto.php:11
 msgid "Select photo from ownCloud"
+msgstr "Selecionar uma foto da ownCloud"
+
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
-msgstr ""
+msgstr "Editar endereço"
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
@@ -475,7 +635,7 @@ msgstr "País"
 
 #: templates/part.edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Editar categorias"
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
@@ -495,15 +655,15 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Sra"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Sr"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Sr"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
@@ -511,7 +671,7 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
@@ -519,11 +679,11 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Nomes adicionais"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Nome de familia"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
@@ -586,21 +746,21 @@ msgid "Submit"
 msgstr "Submeter"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "Importar um ficheiro de contactos"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "Por favor seleccione o livro de endereços"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "Criar um novo livro de endereços"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
@@ -608,33 +768,28 @@ msgstr ""
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Importar"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
+msgstr "A importar os contactos"
 
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
@@ -644,7 +799,7 @@ msgstr ""
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Adicionar contacto"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
@@ -656,7 +811,7 @@ msgstr ""
 
 #: templates/settings.php:4
 msgid "more info"
-msgstr ""
+msgstr "mais informação"
 
 #: templates/settings.php:6
 msgid "Primary address (Kontact et al)"
@@ -664,4 +819,4 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 6bfda24464..c1427407a8 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <helder.meneses@gmail.com>, 2011, 2012.
+# Helder Meneses <helder.meneses@gmail.com>, 2012.
 #   <rjgpp.1994@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -21,14 +22,90 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Nome da aplicação não definida."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Nenhuma categoria para adicionar?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Esta categoria já existe:"
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -37,7 +114,7 @@ msgstr "Redefinir palavra-chave ownCloud"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "Reposição da password ownCloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -102,7 +179,7 @@ msgstr "Ajuda"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Acesso interdito"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -110,11 +187,11 @@ msgstr "Cloud nao encontrada"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Editar categorias"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Adicionar"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -161,15 +238,15 @@ msgstr "Host da base de dados"
 msgid "Finish setup"
 msgstr "Acabar instalação"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "serviços web sob o seu controlo"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Sair"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Definições"
 
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 7b8597d2e9..8779bcac2b 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Helder Meneses <helder.meneses@gmail.com>, 2012.
 #   <rjgpp.1994@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -46,15 +47,67 @@ msgstr "Falta uma pasta temporária"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Falhou a escrita no disco"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Ficheiros"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Tamanho"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modificado"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Manuseamento de ficheiros"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -62,23 +115,23 @@ msgstr "Tamanho máximo de envio"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "max. possivel: "
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Necessário para multi download de ficheiros e pastas"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Ativar dowload de ficheiros ZIP"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 é ilimitado"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Tamanho máximo para ficheiros ZIP"
 
 #: templates/index.php:7
 msgid "New"
@@ -94,7 +147,7 @@ msgstr "Pasta"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "Do endereço"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -102,7 +155,7 @@ msgstr "Enviar"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Cancelar upload"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -114,24 +167,12 @@ msgstr "Nome"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Partilhar"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Tamanho"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modificado"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Apagar"
@@ -148,8 +189,8 @@ msgstr "Os ficheiro que estás a tentar enviar excedem o tamanho máximo de envi
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Os ficheiros estão a ser analisados, por favor aguarde."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Análise actual"
diff --git a/l10n/pt_PT/gallery.po b/l10n/pt_PT/gallery.po
index 14a2a55e87..5a8f443a91 100644
--- a/l10n/pt_PT/gallery.po
+++ b/l10n/pt_PT/gallery.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <helder.meneses@gmail.com>, 2012.
+# Helder Meneses <helder.meneses@gmail.com>, 2012.
 #   <rjgpp.1994@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +20,48 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Imagens"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Definições"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -29,15 +70,11 @@ msgstr "Atualizar"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Parar"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Partilhar"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -45,16 +82,16 @@ msgstr "Voltar"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Remove confirmação"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Deseja remover o album"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Mudar o nome do album"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Novo nome do album"
diff --git a/l10n/pt_PT/media.po b/l10n/pt_PT/media.po
index 8cc68c028b..ca25576702 100644
--- a/l10n/pt_PT/media.po
+++ b/l10n/pt_PT/media.po
@@ -7,10 +7,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
-"Last-Translator: rjgpp1994 <rjgpp.1994@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musica"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Reproduzir"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pausa"
 
@@ -34,7 +38,7 @@ msgstr "Pausa"
 msgid "Previous"
 msgstr "Anterior"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Próximo"
 
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index f69a3f1fe1..9a87a9c31f 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -20,57 +20,76 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "endereço de email alterado"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Pedido inválido"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID alterado"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Pedido inválido"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Idioma alterado"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Mais"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Adicione a sua aplicação"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Selecione uma aplicação"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licenciado"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "por"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Documentação"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Gestão de ficheiros grandes"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -98,11 +117,11 @@ msgstr "do disponível"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Clientes de sincronização desktop e movel"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Transferir"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -170,11 +189,11 @@ msgstr "Criar"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Quota por defeito"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Outro"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/ro/calendar.po b/l10n/ro/calendar.po
index a1f91c1b97..0521a803f4 100644
--- a/l10n/ro/calendar.po
+++ b/l10n/ro/calendar.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
+# Dimon Pockemon <>, 2012.
 # Eugen Mihalache <eugemjj@gmail.com>, 2012.
 # Ovidiu Tache <ovidiutache@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -22,11 +23,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Nici un calendar găsit."
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Nici un eveniment găsit."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -44,79 +45,103 @@ msgstr "Fus orar schimbat"
 msgid "Invalid request"
 msgstr "Cerere eronată"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendar"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "LLL z[aaaa]{'&#8212;'[LLL] z aaaa}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Zi de naștere"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Afaceri"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Sună"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Clienți"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Curier"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Sărbători"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Idei"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Călătorie"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Aniversare"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Întâlnire"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Altele"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Personal"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Proiecte"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Întrebări"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Servici"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "fără nume"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -365,7 +390,7 @@ msgstr "Alege calendarele active"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Calendarele tale"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -374,15 +399,15 @@ msgstr "Legătură CalDav"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Calendare partajate"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Nici un calendar partajat"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Partajați calendarul"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -399,7 +424,7 @@ msgstr "Șterge"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "Partajat cu tine de"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -444,23 +469,23 @@ msgstr "Exportă"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Informații despre eveniment"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Ciclic"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Alarmă"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Participanți"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Partajează"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -472,11 +497,11 @@ msgstr "Categorie"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Separă categoriile prin virgule"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Editează categorii"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -597,11 +622,11 @@ msgstr "Crează un eveniment nou"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Vizualizează un eveniment"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "Nici o categorie selectată"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -609,11 +634,11 @@ msgstr "Selecteză categoria"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "din"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "la"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -637,7 +662,7 @@ msgstr "12h"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "Prima zi a săptămînii"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
@@ -645,24 +670,24 @@ msgstr "Adresa pentru sincronizarea calendarului CalDAV"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Utilizatori"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "utilizatori selectați"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Editabil"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Grupuri"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "grupuri selectate"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "fă public"
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index d4d9f15b1c..1a257a7947 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
+# Dimon Pockemon <>, 2012.
 # Eugen Mihalache <eugemjj@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -45,35 +46,35 @@ msgstr "Contactul nu a putut fi adăugat."
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "Nici un ID nu a fost furnizat"
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Eroare la stabilirea sumei de control"
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nici o categorie selectată pentru ștergere"
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
-msgstr ""
+msgstr "Nici o carte de adrese găsită"
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "Nici un contact găsit"
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
-msgstr ""
+msgstr "ID lipsă"
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "Eroare la prelucrarea VCard-ului pentru ID:\""
 
 #: ajax/createaddressbook.php:18
 msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "Nu e posibil de adăugat o carte de adrese fără nume"
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
@@ -83,29 +84,26 @@ msgstr "Agenda nu a putut fi adăugată."
 msgid "Error activating addressbook."
 msgstr "Eroare la activarea agendei."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "Nici un ID de contact nu a fost transmis"
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Eroare la citerea fotografiei de contact"
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Eroare la salvarea fișierului temporar."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
-msgstr ""
+msgstr "Fotografia care se încarcă nu este validă."
 
 #: ajax/deletecard.php:37 ajax/saveproperty.php:58
 msgid "id is not set."
-msgstr ""
+msgstr "ID-ul nu este stabilit"
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -117,27 +115,59 @@ msgstr "Eroare la ștergerea proprietăților contactului."
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "ID-ul de contact lipsește."
 
 #: ajax/loadphoto.php:44
 msgid "Missing contact id."
-msgstr ""
+msgstr "ID de contact lipsă."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
+msgstr "Nici o adresă către fotografie nu a fost transmisă"
+
+#: ajax/oc_photo.php:48
+msgid "File doesn't exist:"
+msgstr "Fișierul nu există:"
+
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Eroare la încărcarea imaginii."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/oc_photo.php:51
-msgid "File doesn't exist:"
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
 msgstr ""
 
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
-msgstr ""
+msgstr "numele elementului nu este stabilit."
 
 #: ajax/saveproperty.php:61
 msgid "checksum is not set."
-msgstr ""
+msgstr "suma de control nu este stabilită."
 
 #: ajax/saveproperty.php:78
 msgid "Information about vCard is incorrect. Please reload the page: "
@@ -147,7 +177,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Eroare la actualizarea proprietăților contactului."
 
@@ -163,108 +193,235 @@ msgstr "Eroare la actualizarea agendei."
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Contacte"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Nu se găsește în agendă."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Contactul nu a putut fi găsit."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresă"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizație"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Servicu"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Acasă"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
-msgstr ""
+msgstr "Mesaj"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
-msgstr ""
+msgstr "Internet"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "Ziua de naștere a {name}"
 
 #: lib/search.php:22
 msgid "Contact"
@@ -327,15 +484,15 @@ msgstr ""
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "Introdu detalii despre nume"
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "Pseudonim"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "Introdu pseudonim"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
@@ -343,19 +500,19 @@ msgstr "Zi de naștere"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "zz-ll-aaaa"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "Grupuri"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "Separă grupurile cu virgule"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "Editează grupuri"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -363,19 +520,19 @@ msgstr "Preferat"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Te rog să specifici un e-mail corect"
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "Introdu adresa de e-mail"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "Trimite mesaj la e-mail"
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "Șterge e-mail"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
@@ -429,6 +586,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -585,7 +746,7 @@ msgid "Submit"
 msgstr "Trimite"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Anulează"
 
@@ -613,27 +774,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 71bfdc95d9..3aed0fedf4 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
+# Dimon Pockemon <>, 2012.
 # Eugen Mihalache <eugemjj@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -21,14 +22,90 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Numele aplicație nu este furnizat."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Nici o categorie de adăugat?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Această categorie deja există:"
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -37,7 +114,7 @@ msgstr "Resetarea parolei ownCloud"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "Resetarea parolei ownCloud "
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -102,7 +179,7 @@ msgstr "Ajutor"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Acces interzis"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -110,11 +187,11 @@ msgstr "Nu s-a găsit"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Editează categoriile"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Adaugă"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -161,15 +238,15 @@ msgstr "Bază date"
 msgid "Finish setup"
 msgstr "Finalizează instalarea"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "servicii web controlate de tine"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Ieșire"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Configurări"
 
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index c0d85daecd..06c259c228 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
+# Dimon Pockemon <>, 2012.
 # Eugen Mihalache <eugemjj@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +48,67 @@ msgstr "Lipsește un dosar temporar"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Eroare la scriere pe disc"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Fișiere"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Dimensiune"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Modificat"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Manipulare fișiere"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -63,23 +116,23 @@ msgstr "Dimensiune maximă admisă la încărcare"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "max. posibil:"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Necesar pentru descărcarea mai multor fișiere și a dosarelor"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Activează descărcare fișiere compresate"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 e nelimitat"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Dimensiunea maximă de intrare pentru fișiere compresate"
 
 #: templates/index.php:7
 msgid "New"
@@ -95,7 +148,7 @@ msgstr "Dosar"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "De la URL"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -103,7 +156,7 @@ msgstr "Încarcă"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Anulează încărcarea"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -115,24 +168,12 @@ msgstr "Nume"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Partajează"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Dimensiune"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Modificat"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Șterge"
@@ -149,8 +190,8 @@ msgstr "Fișierul care l-ai încărcat a depășită limita maximă admisă la 
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Fișierele sunt scanate, te rog așteptă."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "În curs de scanare"
diff --git a/l10n/ro/gallery.po b/l10n/ro/gallery.po
index ffdf7bbf5d..4bf7a3d271 100644
--- a/l10n/ro/gallery.po
+++ b/l10n/ro/gallery.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Claudiu  <claudiu@tanaselia.ro>, 2012.
+# Dimon Pockemon <>, 2012.
 # Eugen Mihalache <eugemjj@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +20,48 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Imagini"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Setări"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -29,15 +70,11 @@ msgstr "Re-scanează"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Stop"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Partajează"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -45,16 +82,16 @@ msgstr "Înapoi"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Șterge confirmarea"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Vrei să ștergi albumul"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Schimbă numele albumului"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Nume nou album"
diff --git a/l10n/ro/media.po b/l10n/ro/media.po
index a3c7b97b6f..8ad58147fa 100644
--- a/l10n/ro/media.po
+++ b/l10n/ro/media.po
@@ -8,10 +8,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-19 20:29+0000\n"
-"Last-Translator: Eugen Mihalache <eugemjj@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,15 +19,19 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Muzică"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Redă"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pauză"
 
@@ -35,7 +39,7 @@ msgstr "Pauză"
 msgid "Previous"
 msgstr "Precedent"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Următor"
 
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 12a1a43875..542bfa8f1c 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
+# Dimon Pockemon <>, 2012.
 # Eugen Mihalache <eugemjj@gmail.com>, 2012.
 #   <icewind1991@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -21,57 +22,76 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "email schimbat"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Cerere eronată"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID schimbat"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Cerere eronată"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Limba a fost schimbată"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "_language_name_"
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Jurnal de activitate"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Mai mult"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Adaugă aplicația ta"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Selectează o aplicație"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-autorizat"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "de"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Documetație"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Gestionînd fișiere mari"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -99,11 +119,11 @@ msgstr "din cele diponibile"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Clienți de sincronizare pentru telefon mobil și desktop"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Descărcări"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -171,11 +191,11 @@ msgstr "Crează"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Cotă implicită"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Altele"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/ru/calendar.po b/l10n/ru/calendar.po
index bf5d91bd80..32c4700f8d 100644
--- a/l10n/ru/calendar.po
+++ b/l10n/ru/calendar.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <jekader@gmail.com>, 2011, 2012.
+# Nick Remeslennikov <homolibere@gmail.com>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +23,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Календари не найдены."
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "События не найдены."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -43,79 +45,103 @@ msgstr "Часовой пояс изменён"
 msgid "Invalid request"
 msgstr "Неверный запрос"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Календарь"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "День рождения"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Бизнес"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Звонить"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Клиенты"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Доставщик"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Праздники"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Идеи"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Поездка"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Юбилей"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Встреча"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Другое"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Личное"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Проекты"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Вопросы"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Работа"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "без имени"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -364,7 +390,7 @@ msgstr "Выберите активные календари"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Ваши календари"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -373,15 +399,15 @@ msgstr "Ссылка для CalDav"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Общие календари"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Нет общих календарей"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Сделать календарь общим"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -398,7 +424,7 @@ msgstr "Удалить"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "с вами поделился"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -443,23 +469,23 @@ msgstr "Экспортировать"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Информация о событии"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Повторение"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Сигнал"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Участники"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Поделиться"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -471,11 +497,11 @@ msgstr "Категория"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Разделяйте категории запятыми"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Редактировать категории"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -596,11 +622,11 @@ msgstr "Создать новое событие"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Показать событие"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "Категории не выбраны"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -636,7 +662,7 @@ msgstr "12ч"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "Первый день недели"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
@@ -644,24 +670,24 @@ msgstr "Адрес синхронизации календаря CalDAV:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Пользователи"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "выбрать пользователей"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Редактируемо"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Группы"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "выбрать группы"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "селать публичным"
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index aac272f8b9..f44e9700f0 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.po
@@ -3,15 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 2012.
+#   <ideamk@gmail.com>, 2012.
 #   <jekader@gmail.com>, 2012.
 #   <lankme@gmail.com>, 2012.
+# Nick Remeslennikov <homolibere@gmail.com>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -46,35 +49,35 @@ msgstr "Ошибка добавления информации к контакт
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "ID не предоставлен"
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Ошибка установки контрольной суммы."
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Категории для удаления не установлены."
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
-msgstr ""
+msgstr "Адресные книги не найдены."
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "Контакты не найдены."
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
-msgstr ""
+msgstr "Отсутствует ID"
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "Ошибка обработки VCard для ID: \""
 
 #: ajax/createaddressbook.php:18
 msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "Нельзя добавить адресную книгу без имени."
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
@@ -84,29 +87,26 @@ msgstr "Ошибка добавления адресной книги."
 msgid "Error activating addressbook."
 msgstr "Ошибка активации адресной книги."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Ошибка чтения фотографии контакта."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Ошибка сохранения временного файла."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
-msgstr ""
+msgstr "Загружаемая фотография испорчена."
 
 #: ajax/deletecard.php:37 ajax/saveproperty.php:58
 msgid "id is not set."
-msgstr ""
+msgstr "id не установлен."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -118,43 +118,75 @@ msgstr "Ошибка удаления информации из контакта
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "ID контакта отсутствует."
 
 #: ajax/loadphoto.php:44
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
+msgstr "Файл не существует:"
+
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Ошибка загрузки картинки."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
 msgstr ""
 
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
-msgstr ""
+msgstr "имя элемента не установлено."
 
 #: ajax/saveproperty.php:61
 msgid "checksum is not set."
-msgstr ""
+msgstr "контрольная сумма не установлена."
 
 #: ajax/saveproperty.php:78
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "Информация о vCard не корректна. Перезагрузите страницу: "
 
 #: ajax/saveproperty.php:83
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Ошибка обновления информации контакта."
 
 #: ajax/updateaddressbook.php:20
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "Нельзя обновить адресную книгу с пустым именем."
 
 #: ajax/updateaddressbook.php:26
 msgid "Error updating addressbook."
@@ -162,110 +194,237 @@ msgstr "Ошибка обновления адресной книги."
 
 #: ajax/uploadimport.php:46 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Ошибка загрузки контактов в хранилище."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Файл загружен успешно."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Загружаемый файл первосходит значение переменной upload_max_filesize, установленно в php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Загружаемый файл превосходит значение переменной MAX_FILE_SIZE, указанной в форме HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Файл загружен частично"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Файл не был загружен"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
+msgstr "Отсутствует временная папка"
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Контакты"
 
-#: lib/app.php:23
-msgid "Addressbook not found."
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: lib/app.php:27
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
+msgid "Addressbook not found."
+msgstr "Адресная книга не найдена."
+
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Это не ваша адресная книга."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Контакт не найден."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Адрес"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Ящик эл. почты"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Организация"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Рабочий"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Домашний"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Голос"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
-msgstr ""
+msgstr "Сообщение"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Пейджер"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
-msgstr ""
+msgstr "Интернет"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "День рождения {name}"
 
 #: lib/search.php:22
 msgid "Contact"
@@ -281,7 +440,7 @@ msgstr "Адресные книги"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Настроить Адресную книгу"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
@@ -289,7 +448,7 @@ msgstr "Новая адресная книга"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
-msgstr ""
+msgstr "Импортировать из VCF"
 
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
@@ -320,7 +479,7 @@ msgstr "Удалить контакт"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
-msgstr ""
+msgstr "Перетяните фотографии для загрузки"
 
 #: templates/part.contact.php:29
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
@@ -332,11 +491,11 @@ msgstr ""
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "Псевдоним"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "Введите псевдоним"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
@@ -344,11 +503,11 @@ msgstr "День рождения"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "dd-mm-yyyy"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "Группы"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
@@ -356,7 +515,7 @@ msgstr ""
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "Редактировать группы"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -364,47 +523,47 @@ msgstr "Предпочитаемый"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Укажите действительный адрес электронной почты."
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "Укажите адрес электронной почты"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "Написать по адресу"
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "Удалить адрес электронной почты"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "Ввести номер телефона"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
-msgstr ""
+msgstr "Удалить номер телефона"
 
 #: templates/part.contact.php:84
 msgid "View on map"
-msgstr ""
+msgstr "Показать на карте"
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
-msgstr ""
+msgstr "Ввести детали адреса"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "Добавьте заметки здесь."
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "Добавить поле"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "Фото профиля"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -412,27 +571,31 @@ msgstr "Телефон"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "Заметка"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
-msgstr ""
+msgstr "Удалить текущую фотографию"
 
 #: templates/part.contactphoto.php:9
 msgid "Edit current photo"
-msgstr ""
+msgstr "Редактировать текущую фотографию"
 
 #: templates/part.contactphoto.php:10
 msgid "Upload new photo"
-msgstr ""
+msgstr "Загрузить новую фотографию"
 
 #: templates/part.contactphoto.php:11
 msgid "Select photo from ownCloud"
+msgstr "Выбрать фотографию из ownCloud"
+
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
-msgstr ""
+msgstr "Редактировать адрес"
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
@@ -475,7 +638,7 @@ msgstr "Страна"
 
 #: templates/part.edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Редактировать категрии"
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
@@ -515,15 +678,15 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Имя"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Дополнительные имена (отчество)"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Фамилия"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
@@ -586,69 +749,64 @@ msgid "Submit"
 msgstr "Отправить"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Отменить"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "Загрузить файл контактов"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "Выберите адресную книгу"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "создать новую адресную книгу"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
+msgstr "Имя новой адресной книги"
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Импорт"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
+msgstr "Импорт контактов"
 
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "В адресной книге есть контакты."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Добавить контакт"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "Настроить адресную книгу"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
@@ -656,7 +814,7 @@ msgstr ""
 
 #: templates/settings.php:4
 msgid "more info"
-msgstr ""
+msgstr "дополнительная информация"
 
 #: templates/settings.php:6
 msgid "Primary address (Kontact et al)"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 68495024b9..315d1deac6 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <jekader@gmail.com>, 2011, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -21,14 +22,90 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Имя приложения не установлено."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Нет категорий для добавления?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Эта категория уже существует: "
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -37,7 +114,7 @@ msgstr "Сброс пароля OwnCloud"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "Сброс пароля "
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -102,7 +179,7 @@ msgstr "Помощь"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Доступ запрещён"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -110,11 +187,11 @@ msgstr "Облако не найдено"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Редактировать категории"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Добавить"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -161,15 +238,15 @@ msgstr "Хост базы данных"
 msgid "Finish setup"
 msgstr "Завершить установку"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "Сетевые службы под твоим контролем"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Выйти"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Настройки"
 
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index acfd4fa635..bda5204072 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <jekader@gmail.com>, 2012.
 #   <lankme@gmail.com>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +49,67 @@ msgstr "Невозможно найти временную папку"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Ошибка записи на диск"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Файлы"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Размер"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Изменен"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Управление файлами"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -64,23 +117,23 @@ msgstr "Максимальный размер файла"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "макс. возможно: "
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Требуется для загрузки нескольких файорв и папок"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Включить ZIP-загрузку"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 - без ограничений"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Максимальный исходный размер для ZIP файлов"
 
 #: templates/index.php:7
 msgid "New"
@@ -96,7 +149,7 @@ msgstr "Папка"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "С url"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -104,7 +157,7 @@ msgstr "Закачать"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Отмена закачки"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -116,24 +169,12 @@ msgstr "Название"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Поделиться"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Размер"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Изменен"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Удалить"
@@ -150,8 +191,8 @@ msgstr "Файлы, которые Вы пытаетесь закачать, п
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Подождите, файлы сканируются."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Текущее сканирование"
diff --git a/l10n/ru/gallery.po b/l10n/ru/gallery.po
index cdec0268d9..34a7474dd4 100644
--- a/l10n/ru/gallery.po
+++ b/l10n/ru/gallery.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <jekader@gmail.com>, 2012.
 #   <lankme@gmail.com>, 2012.
 # Soul Kim <warlock.rf@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -20,8 +21,48 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Рисунки"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Настройки"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -30,15 +71,11 @@ msgstr "Обновить"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Остановить"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Поделиться"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -46,16 +83,16 @@ msgstr "Назад"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Подтверждение удаления"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Вы хотите удалить альбом?"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Изменить имя альбома"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Новое имя альбома"
diff --git a/l10n/ru/media.po b/l10n/ru/media.po
index f4f92b42e0..ed56405523 100644
--- a/l10n/ru/media.po
+++ b/l10n/ru/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Музыка"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Проиграть"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Пауза"
 
@@ -34,7 +38,7 @@ msgstr "Пауза"
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Следующий"
 
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index f5e3ebb05f..05b03aad0b 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <icewind1991@gmail.com>, 2012.
 #   <jekader@gmail.com>, 2012.
 #   <lankme@gmail.com>, 2012.
@@ -10,9 +11,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -22,57 +23,76 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "адрес электронной почты изменён"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Неверный запрос"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
-msgstr "OpenID был изменён"
+msgstr "OpenID изменён"
+
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Неверный запрос"
 
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Язык изменён"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Русский "
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Журнал"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Ещё"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Добавить приложение"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Выберите приложение"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-лицензия"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "от"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Документация"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Управление большими файлами"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -100,11 +120,11 @@ msgstr "из доступных"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Клиенты синхронизации для рабочих станций и мобильных устройств"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Загрузка"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -172,11 +192,11 @@ msgstr "Создать"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Квота по умолчанию"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Другое"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/sk_SK/calendar.po b/l10n/sk_SK/calendar.po
index e853dfa3fa..3092e784c2 100644
--- a/l10n/sk_SK/calendar.po
+++ b/l10n/sk_SK/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 17:21+0000\n"
-"Last-Translator: Roman Priesol <roman@priesol.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,16 +43,40 @@ msgstr "Časové pásmo zmenené"
 msgid "Invalid request"
 msgstr "Neplatná požiadavka"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalendár"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d. MMM[ yyyy]{ '&#8212;' d.[ MMM] yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Narodeniny"
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index a28db46e37..5f8e53bfa1 100644
--- a/l10n/sk_SK/contacts.po
+++ b/l10n/sk_SK/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 18:38+0000\n"
-"Last-Translator: Roman Priesol <roman@priesol.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,23 +83,20 @@ msgstr "Chyba počas pridávania adresára."
 msgid "Error activating addressbook."
 msgstr "Chyba aktivovania adresára."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Nebolo nastavené ID kontaktu."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Chyba pri nahrávaní obrázka."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Chyba pri čítaní fotky kontaktu."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Chyba pri ukladaní dočasného súboru."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Načítaná fotka je vadná."
 
@@ -123,14 +120,46 @@ msgstr "Chýba ID kontaktu."
 msgid "Missing contact id."
 msgstr "Chýba ID kontaktu."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Žiadna fotka nebola poslaná."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Súbor neexistuje:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Chyba pri nahrávaní obrázka."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "meno elementu nie je nastavené."
@@ -147,7 +176,7 @@ msgstr "Informácia o vCard je nesprávna. Obnovte stránku, prosím."
 msgid "Something went FUBAR. "
 msgstr "Niečo sa pokazilo."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Chyba aktualizovania údaju kontaktu."
 
@@ -163,102 +192,229 @@ msgstr "Chyba aktualizácie adresára."
 msgid "Error uploading contacts to storage."
 msgstr "Chyba pri ukladaní kontaktov na úložisko."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Nevyskytla sa žiadna chyba, súbor úspešne uložené."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Ukladaný súbor prekračuje nastavenie upload_max_filesize v php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Ukladaný súbor prekračuje nastavenie MAX_FILE_SIZE z volieb HTML formulára."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Ukladaný súbor sa nahral len čiastočne"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Žiadny súbor nebol uložený"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Chýba dočasný priečinok"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Pretiahnite VCF súbor pre import kontaktov."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Adresár sa nenašiel."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Toto nie je váš adresár."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontakt nebol nájdený."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefón"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizácia"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Práca"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Domov"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Odkazová schránka"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Správa"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -429,6 +585,10 @@ msgstr "Nahrať novú fotku"
 msgid "Select photo from ownCloud"
 msgstr "Vybrať fotku z ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Upraviť adresu"
@@ -585,7 +745,7 @@ msgid "Submit"
 msgstr "Odoslať"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Zrušiť"
 
@@ -613,27 +773,22 @@ msgstr "Importovať"
 msgid "Importing contacts"
 msgstr "Importovanie kontaktov"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Kontakty úspešne importované"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Zatvoriť ponuku"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Importovanie adresára"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Vyberte adresár, do ktorého chcete importovať:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Pretiahnite VCF súbor pre import kontaktov."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Vyberte z pevného disku"
 
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 3bd9097321..bff7d669a1 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 17:12+0000\n"
-"Last-Translator: Roman Priesol <roman@priesol.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,6 +31,82 @@ msgstr "Žiadna kategória pre pridanie?"
 msgid "This category already exists: "
 msgstr "Táto kategória už existuje:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Obnova Owncloud hesla"
@@ -161,15 +237,15 @@ msgstr "Server databázy"
 msgid "Finish setup"
 msgstr "Dokončiť inštaláciu"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "webové služby pod vašou kontrolou"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Odhlásiť"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Nastavenia"
 
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 42e440e484..4b6d83e8ca 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 17:28+0000\n"
-"Last-Translator: Roman Priesol <roman@priesol.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "Chýbajúci dočasný priečinok"
 msgid "Failed to write to disk"
 msgstr "Zápis na disk sa nepodaril"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Súbory"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Veľkosť"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Upravené"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Nastavenie správanie k súborom"
@@ -121,18 +173,6 @@ msgstr "Zdielať"
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Veľkosť"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Upravené"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Odstrániť všetko"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Odstrániť"
diff --git a/l10n/sk_SK/gallery.po b/l10n/sk_SK/gallery.po
index e74a7b52c1..2f6336c77c 100644
--- a/l10n/sk_SK/gallery.po
+++ b/l10n/sk_SK/gallery.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 18:31+0000\n"
-"Last-Translator: Roman Priesol <roman@priesol.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,50 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Obrázky"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "nastavenia"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Znovu oskenovať"
@@ -35,10 +75,6 @@ msgstr "Zastaviť"
 msgid "Share"
 msgstr "Zdielať"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "nastavenia"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Späť"
diff --git a/l10n/sk_SK/media.po b/l10n/sk_SK/media.po
index 523e59157b..1c692c89de 100644
--- a/l10n/sk_SK/media.po
+++ b/l10n/sk_SK/media.po
@@ -7,10 +7,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-04-06 15:17+0000\n"
-"Last-Translator: Roman Priesol <roman@priesol.net>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Hudba"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Prehrať"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pauza"
 
@@ -34,7 +38,7 @@ msgstr "Pauza"
 msgid "Previous"
 msgstr "Predchádzajúce"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Ďalšie"
 
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 28ec32ee4a..bbf5f21cce 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-16 17:32+0000\n"
-"Last-Translator: Roman Priesol <roman@priesol.net>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,23 +21,38 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "email zmenený"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Neplatná požiadavka"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID zmenené"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Neplatná požiadavka"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Jazyk zmenený"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Slovensky"
 
@@ -58,10 +73,14 @@ msgid "Select an App"
 msgstr "Vyberte aplikáciu"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licencované"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "od"
 
diff --git a/l10n/sl/calendar.po b/l10n/sl/calendar.po
index 3d500321bf..d4f7e0cf0d 100644
--- a/l10n/sl/calendar.po
+++ b/l10n/sl/calendar.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 11:19+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,16 +45,40 @@ msgstr "Časovni pas je bil spremenjen"
 msgid "Invalid request"
 msgstr "Neveljaven zahtevek"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Koledar"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Rojstni dan"
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index 8f8a78a9df..cdcf17de4e 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -84,23 +84,20 @@ msgstr "Napaka pri dodajanju imenika."
 msgid "Error activating addressbook."
 msgstr "Napaka pri aktiviranju imenika."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "ID stika ni bil poslan."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "Napaka pri nalaganju slike."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Napaka pri branju slike stika."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Napaka pri shranjevanju začasne datoteke."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Slika, ki se nalaga ni veljavna."
 
@@ -124,14 +121,46 @@ msgstr "Manjka ID stika."
 msgid "Missing contact id."
 msgstr "Manjka id stika."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Pot slike ni bila poslana."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Datoteka ne obstaja:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Napaka pri nalaganju slike."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "ime elementa ni nastavljeno."
@@ -148,7 +177,7 @@ msgstr "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: "
 msgid "Something went FUBAR. "
 msgstr "Nekaj je šlo v franže. "
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Napaka pri posodabljanju lastnosti stika."
 
@@ -164,102 +193,229 @@ msgstr "Napaka pri posodabljanju imenika."
 msgid "Error uploading contacts to storage."
 msgstr "Napaka pri nalaganju stikov v hrambo."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Datoteka je bila uspešno naložena."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Naložena datoteka presega velikost, ki jo določa parameter upload_max_filesize v datoteki php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Naložena datoteka presega velikost, ki jo določa parameter MAX_FILE_SIZE v HTML obrazcu"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Datoteka je bila le delno naložena"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Nobena datoteka ni bila naložena"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Manjka začasna mapa"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Stiki"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Za uvoz stikov spustite VCF datoteko tukaj."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Imenik ni bil najden."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "To ni vaš imenik."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Stika ni bilo mogoče najti."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Naslov"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-pošta"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Delo"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Doma"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobilni telefon"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Besedilo"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Glas"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "Sporočilo"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pozivnik"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "Internet"
 
@@ -430,6 +586,10 @@ msgstr "Naloži novo sliko"
 msgid "Select photo from ownCloud"
 msgstr "Izberi sliko iz ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Uredi naslov"
@@ -586,7 +746,7 @@ msgid "Submit"
 msgstr "Potrdi"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Prekliči"
 
@@ -614,27 +774,22 @@ msgstr "Uvozi"
 msgid "Importing contacts"
 msgstr "Uvažam stike"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Stiki so bili uspešno uvoženi"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Zapri dialog"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Uvozi imenik"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "Izberite imenik v katerega boste uvažali:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Za uvoz stikov spustite VCF datoteko tukaj."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "Izberi iz HD"
 
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index eea2558280..18d08e1a93 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 11:20+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,6 +32,82 @@ msgstr "Ni kategorije za dodajanje?"
 msgid "This category already exists: "
 msgstr "Ta kategorija že obstaja:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Ponastavi ownCloud geslo"
@@ -162,15 +238,15 @@ msgstr "Gostitelj podatkovne zbirke"
 msgid "Finish setup"
 msgstr "Dokončaj namestitev"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "spletne storitve pod vašim nadzorom"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Odjava"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Nastavitve"
 
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 9169710bee..7c9c372c04 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 11:20+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,10 +50,62 @@ msgstr "Manjka začasna mapa"
 msgid "Failed to write to disk"
 msgstr "Pisanje na disk je spodletelo"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Datoteke"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Velikost"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Spremenjeno"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Rokovanje z datotekami"
@@ -122,18 +174,6 @@ msgstr "Souporaba"
 msgid "Download"
 msgstr "Prejmi"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Velikost"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Spremenjeno"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Izbriši vse"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Izbriši"
diff --git a/l10n/sl/gallery.po b/l10n/sl/gallery.po
index 9e3e07ca7f..1fe6c5af7b 100644
--- a/l10n/sl/gallery.po
+++ b/l10n/sl/gallery.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 18:08+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,10 +20,50 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Slike"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Nastavitve"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Ponovno preišči"
@@ -36,10 +76,6 @@ msgstr "Stop"
 msgid "Share"
 msgstr "Deli"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Nastavitve"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Nazaj"
diff --git a/l10n/sl/media.po b/l10n/sl/media.po
index 254d97af95..f33402c979 100644
--- a/l10n/sl/media.po
+++ b/l10n/sl/media.po
@@ -8,10 +8,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-04 08:31+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,15 +19,19 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Glasba"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Predvajaj"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Premor"
 
@@ -35,7 +39,7 @@ msgstr "Premor"
 msgid "Previous"
 msgstr "Prejšnja"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Naslednja"
 
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 2652ed92e4..b5b8a14fb3 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 18:12+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,23 +21,38 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "E-poštni naslov je bil spremenjen"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Neveljaven zahtevek"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID je bil spremenjen"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Neveljaven zahtevek"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Jezik je bil spremenjen"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__ime_jezika__"
 
@@ -58,10 +73,14 @@ msgid "Select an App"
 msgstr "Izberite aplikacijo"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licencirana"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "s strani"
 
diff --git a/l10n/sr/calendar.po b/l10n/sr/calendar.po
index 6144b6c4c4..4245b5f8f0 100644
--- a/l10n/sr/calendar.po
+++ b/l10n/sr/calendar.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -42,77 +42,101 @@ msgstr "Временска зона је промењена"
 msgid "Invalid request"
 msgstr "Неисправан захтев"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Календар"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Рођендан"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Посао"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Позив"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Клијенти"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Достављач"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Празници"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Идеје"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "путовање"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "јубилеј"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Састанак"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Друго"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Лично"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Пројекти"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Питања"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Посао"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index 8ccf3378e0..2ab147d01c 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -82,23 +82,20 @@ msgstr ""
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,14 +119,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -146,7 +175,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -162,102 +191,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Контакти"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Ово није ваш адресар."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Контакт се не може наћи."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Е-маил"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Организација"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Посао"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Кућа"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Мобилни"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Глас"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Пејџер"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -428,6 +584,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -584,7 +744,7 @@ msgid "Submit"
 msgstr "Пошаљи"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Откажи"
 
@@ -612,27 +772,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 966c3dc555..a6aac06e0f 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -30,6 +30,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Ресетовање лозинке за Оунклауд"
@@ -160,15 +236,15 @@ msgstr "Домаћин базе"
 msgid "Finish setup"
 msgstr "Заврши подешавање"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "веб сервиси под контролом"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Одјава"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Подешавања"
 
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 3940cf3425..af2fa73a8c 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -48,10 +48,62 @@ msgstr "Недостаје привремена фасцикла"
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Фајлови"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Величина"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Задња измена"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -120,18 +172,6 @@ msgstr ""
 msgid "Download"
 msgstr "Преузми"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Величина"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Задња измена"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Обриши"
diff --git a/l10n/sr/gallery.po b/l10n/sr/gallery.po
index beceed21ff..befc9958cc 100644
--- a/l10n/sr/gallery.po
+++ b/l10n/sr/gallery.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Претражи поново"
@@ -34,10 +74,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Назад"
diff --git a/l10n/sr/media.po b/l10n/sr/media.po
index e487a3d17c..49f28998de 100644
--- a/l10n/sr/media.po
+++ b/l10n/sr/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Музика"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Пусти"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Паузирај"
 
@@ -34,7 +38,7 @@ msgstr "Паузирај"
 msgid "Previous"
 msgstr "Претходна"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Следећа"
 
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 3854f74607..f6582fdc74 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,23 +19,38 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Неисправан захтев"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID је измењен"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Неисправан захтев"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Језик је измењен"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -56,10 +71,14 @@ msgid "Select an App"
 msgstr "Изаберите програм"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-лиценциран"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "од"
 
diff --git a/l10n/sr@latin/calendar.po b/l10n/sr@latin/calendar.po
index 3a4d5f595b..cfea90215c 100644
--- a/l10n/sr@latin/calendar.po
+++ b/l10n/sr@latin/calendar.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -42,77 +42,101 @@ msgstr "Vremenska zona je promenjena"
 msgid "Invalid request"
 msgstr "Neispravan zahtev"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Rođendan"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Posao"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Poziv"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Klijenti"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Dostavljač"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Praznici"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Ideje"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "putovanje"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "jubilej"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Drugo"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Lično"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Projekti"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Pitanja"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index cc66bf04f1..612bae6687 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -82,23 +82,20 @@ msgstr ""
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,14 +119,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -146,7 +175,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -162,102 +191,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Ovo nije vaš adresar."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontakt se ne može naći."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Kuća"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobilni"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Glas"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Pejdžer"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -428,6 +584,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -584,7 +744,7 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -612,27 +772,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 9a4c9d2a9e..c11fdd41d6 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -30,6 +30,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr ""
@@ -160,15 +236,15 @@ msgstr "Domaćin baze"
 msgid "Finish setup"
 msgstr "Završi podešavanje"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Odjava"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Podešavanja"
 
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 1326b77a53..1f04e28190 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -48,10 +48,62 @@ msgstr "Nedostaje privremena fascikla"
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Fajlovi"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Veličina"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Zadnja izmena"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -120,18 +172,6 @@ msgstr ""
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Veličina"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Zadnja izmena"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Obriši"
diff --git a/l10n/sr@latin/gallery.po b/l10n/sr@latin/gallery.po
index df212fab85..7ff467f683 100644
--- a/l10n/sr@latin/gallery.po
+++ b/l10n/sr@latin/gallery.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,50 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr ""
@@ -33,10 +73,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr ""
diff --git a/l10n/sr@latin/media.po b/l10n/sr@latin/media.po
index 212ff5d5df..4bbe1bb1bc 100644
--- a/l10n/sr@latin/media.po
+++ b/l10n/sr@latin/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Muzika"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Pusti"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Pauziraj"
 
@@ -34,7 +38,7 @@ msgstr "Pauziraj"
 msgid "Previous"
 msgstr "Prethodna"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Sledeća"
 
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 6d153cdb7b..cd74e98410 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -19,23 +19,38 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Neispravan zahtev"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID je izmenjen"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Neispravan zahtev"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Jezik je izmenjen"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -56,10 +71,14 @@ msgid "Select an App"
 msgstr "Izaberite program"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licenciran"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "od"
 
diff --git a/l10n/sv/calendar.po b/l10n/sv/calendar.po
index 0eb940c3a4..f8c88e6587 100644
--- a/l10n/sv/calendar.po
+++ b/l10n/sv/calendar.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Christer Eriksson <post@hc3web.com>, 2012.
+# Daniel Sandman <revoltism@gmail.com>, 2012.
 #   <revoltism@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +22,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "Inga kalendrar funna"
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "Inga händelser funna."
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -43,79 +44,103 @@ msgstr "Tidszon ändrad"
 msgid "Invalid request"
 msgstr "Ogiltig begäran"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:788
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+#: js/calendar.js:93
+msgid "Deletion failed"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "Födelsedag"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Företag"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Ringa"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Klienter"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr "Leverantör"
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Semester"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Idéer"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Resa"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Jubileum"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Möte"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Annat"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Personlig"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Projekt"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Frågor"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Arbetet"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "Namn saknas"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -364,7 +389,7 @@ msgstr "Välj aktiva kalendrar"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Dina kalendrar"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -373,15 +398,15 @@ msgstr "CalDAV-länk"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Delade kalendrar"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Inga delade kalendrar"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "Dela kalender"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -398,7 +423,7 @@ msgstr "Radera"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "delad med dig av"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -443,23 +468,23 @@ msgstr "Exportera"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Händelseinfo"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Repetera"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Alarm"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Deltagare"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Dela"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -471,11 +496,11 @@ msgstr "Kategori"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Separera kategorier med komman"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Redigera kategorier"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -596,11 +621,11 @@ msgstr "Skapa en ny händelse"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Visa en händelse"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "Inga kategorier valda"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -608,11 +633,11 @@ msgstr "Välj kategori"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "av"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "på"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -636,7 +661,7 @@ msgstr "12h"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "Första dagen av veckan"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
@@ -644,24 +669,24 @@ msgstr "Synkroniseringsadress för CalDAV kalender:"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Användare"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "välj användare"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Redigerbar"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Grupper"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "Välj grupper"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "Gör offentlig"
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index fe61cfd8bf..0de8591cea 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Christer Eriksson <post@hc3web.com>, 2012.
+# Daniel Sandman <revoltism@gmail.com>, 2012.
 #   <revoltism@gmail.com>, 2011, 2012.
+#   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -45,27 +47,27 @@ msgstr "Fel när kontaktegenskap skulle läggas till"
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "Inget ID angett"
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Fel uppstod när kontrollsumma skulle sättas."
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Inga kategorier valda för borttaging"
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
-msgstr ""
+msgstr "Ingen adressbok funnen."
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "Inga kontakter funna."
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
-msgstr ""
+msgstr "ID saknas"
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
@@ -73,7 +75,7 @@ msgstr ""
 
 #: ajax/createaddressbook.php:18
 msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "Kan inte lägga till adressbok med ett tomt namn."
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
@@ -83,29 +85,26 @@ msgstr "Fel när adressbok skulle läggas till"
 msgid "Error activating addressbook."
 msgstr "Fel uppstod när adressbok skulle aktiveras"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "Inget kontakt-ID angavs."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Fel uppstod när "
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Fel uppstod när temporär fil skulle sparas."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
-msgstr ""
+msgstr "Det laddade fotot är inte giltigt."
 
 #: ajax/deletecard.php:37 ajax/saveproperty.php:58
 msgid "id is not set."
-msgstr ""
+msgstr "ID är inte satt."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -117,18 +116,50 @@ msgstr "Fel uppstod när kontaktegenskap skulle tas bort"
 
 #: ajax/editname.php:37
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "Kontakt-ID saknas."
 
 #: ajax/loadphoto.php:44
 msgid "Missing contact id."
-msgstr ""
+msgstr "Saknar kontakt-ID."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
+msgstr "Ingen sökväg till foto angavs."
+
+#: ajax/oc_photo.php:48
+msgid "File doesn't exist:"
+msgstr "Filen existerar inte."
+
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "Fel uppstod när bild laddades."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/oc_photo.php:51
-msgid "File doesn't exist:"
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
 msgstr ""
 
 #: ajax/saveproperty.php:55
@@ -137,23 +168,23 @@ msgstr ""
 
 #: ajax/saveproperty.php:61
 msgid "checksum is not set."
-msgstr ""
+msgstr "kontrollsumma är inte satt."
 
 #: ajax/saveproperty.php:78
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "Informationen om vCard är fel. Ladda om sidan:"
 
 #: ajax/saveproperty.php:83
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Fel uppstod när kontaktegenskap skulle uppdateras"
 
 #: ajax/updateaddressbook.php:20
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "Kan inte uppdatera adressboken med ett tomt namn."
 
 #: ajax/updateaddressbook.php:26
 msgid "Error updating addressbook."
@@ -161,110 +192,237 @@ msgstr "Fel uppstod när adressbok skulle uppdateras"
 
 #: ajax/uploadimport.php:46 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Fel uppstod när kontakt skulle lagras."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Inga fel uppstod. Filen laddades upp utan problem."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Den uppladdade filen överskrider upload_max_filesize direktivet i php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Den uppladdade filen överskrider MAX_FILE_SIZE direktivet som har angetts i HTML formuläret"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Den uppladdade filen var bara delvist uppladdad"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Ingen fil laddades upp"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
+msgstr "En temporär mapp saknas"
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: lib/app.php:23
-msgid "Addressbook not found."
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: lib/app.php:27
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Släpp en VCF-fil för att importera kontakter."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
+msgid "Addressbook not found."
+msgstr "Hittade inte adressboken"
+
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Det här är inte din adressbok."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kontakt kunde inte hittas."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adress"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "Arbete"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Hem"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Röst"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
-msgstr ""
+msgstr "Meddelande"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Personsökare"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
-msgstr ""
+msgstr "Internet"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "{name}'s födelsedag"
 
 #: lib/search.php:22
 msgid "Contact"
@@ -280,7 +438,7 @@ msgstr "Adressböcker"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Konfigurera adressböcker"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
@@ -288,7 +446,7 @@ msgstr "Ny adressbok"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
-msgstr ""
+msgstr "Importera från VCF"
 
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
@@ -319,23 +477,23 @@ msgstr "Radera kontakt"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
-msgstr ""
+msgstr "Släpp foto för att ladda upp"
 
 #: templates/part.contact.php:29
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+msgstr " anpassad, korta namn, hela namn, bakåt eller bakåt med komma"
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "Redigera detaljer för namn"
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
-msgstr ""
+msgstr "Smeknamn"
 
 #: templates/part.contact.php:36
 msgid "Enter nickname"
-msgstr ""
+msgstr "Ange smeknamn"
 
 #: templates/part.contact.php:37 templates/part.contact.php:106
 msgid "Birthday"
@@ -343,19 +501,19 @@ msgstr "Födelsedag"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "dd-mm-åååå"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
-msgstr ""
+msgstr "Grupper"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "Separera grupperna med kommatecken"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
-msgstr ""
+msgstr "Editera grupper"
 
 #: templates/part.contact.php:55 templates/part.contact.php:69
 msgid "Preferred"
@@ -363,47 +521,47 @@ msgstr "Föredragen"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Vänligen ange en giltig e-postadress"
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
-msgstr ""
+msgstr "Ange e-postadress"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "Posta till adress."
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "Ta bort e-postadress"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "Ange ett telefonnummer"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
-msgstr ""
+msgstr "Ta bort telefonnummer"
 
 #: templates/part.contact.php:84
 msgid "View on map"
-msgstr ""
+msgstr "Visa på karta"
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
-msgstr ""
+msgstr "Redigera detaljer för adress"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "Lägg till noteringar här."
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "Lägg till fält"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "Profilbild"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -411,27 +569,31 @@ msgstr "Telefon"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "Notering"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
-msgstr ""
+msgstr "Ta bort aktuellt foto"
 
 #: templates/part.contactphoto.php:9
 msgid "Edit current photo"
-msgstr ""
+msgstr "Redigera aktuellt foto"
 
 #: templates/part.contactphoto.php:10
 msgid "Upload new photo"
-msgstr ""
+msgstr "Ladda upp ett nytt foto"
 
 #: templates/part.contactphoto.php:11
 msgid "Select photo from ownCloud"
+msgstr "Välj foto från ownCloud"
+
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
 msgstr ""
 
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
-msgstr ""
+msgstr "Editera adress"
 
 #: templates/part.edit_address_dialog.php:14
 msgid "Type"
@@ -474,7 +636,7 @@ msgstr "Land"
 
 #: templates/part.edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Editera kategorier"
 
 #: templates/part.edit_categories_dialog.php:14
 msgid "Add"
@@ -490,15 +652,15 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Herr"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Ingen adressbok funnen."
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Fru"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
@@ -506,23 +668,23 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Fröken"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Förnamn"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Mellannamn"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Efternamn"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
@@ -546,7 +708,7 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Fil.dr."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
@@ -585,82 +747,77 @@ msgid "Submit"
 msgstr "Skicka in"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Avbryt"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "Importera en kontaktfil"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "Vänligen välj adressboken"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "skapa en ny adressbok"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
+msgstr "Namn för ny adressbok"
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Importera"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
+msgstr "Importerar kontakter"
 
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
-msgstr ""
+msgstr "Importera till adressbok:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
-msgstr ""
+msgstr "Välj från hårddisk"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Du har inga kontakter i din adressbok."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Lägg till en kontakt"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "Konfigurera adressböcker"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "CardDAV synkningsadresser"
 
 #: templates/settings.php:4
 msgid "more info"
-msgstr ""
+msgstr "mera information"
 
 #: templates/settings.php:6
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Primär adress (Kontakt o.a.)"
 
 #: templates/settings.php:8
 msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index aa826461e9..2dc7248b2f 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Christer Eriksson <post@hc3web.com>, 2012.
+# Daniel Sandman <revoltism@gmail.com>, 2012.
 #   <hakan.thn@gmail.com>, 2011.
 #   <revoltism@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -22,14 +23,90 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Programnamn har inte angetts"
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Ingen kategori att lägga till?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
+msgstr "Denna kategori finns redan:"
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
@@ -38,7 +115,7 @@ msgstr "Owncloud lösenordsåterställning"
 
 #: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "ownCloud lösenordsåterställning"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -103,7 +180,7 @@ msgstr "Hjälp"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Åtkomst förbjuden"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -111,11 +188,11 @@ msgstr "Hittade inget moln"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Redigera kategorier"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Lägg till"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -162,15 +239,15 @@ msgstr "Databasserver"
 msgid "Finish setup"
 msgstr "Avsluta installation"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "webbtjänster under din kontroll"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Logga ut"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Inställningar"
 
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index aacfdc05d8..60c136d611 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Christer Eriksson <post@hc3web.com>, 2012.
+# Daniel Sandman <revoltism@gmail.com>, 2012.
 #   <revoltism@gmail.com>, 2011, 2012.
+#   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -47,39 +49,91 @@ msgstr "Saknar en tillfällig mapp"
 
 #: ajax/upload.php:25
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Misslyckades spara till disk"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Filer"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Storlek"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Ändrad"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Filhantering"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
-msgstr "Maximal storlek att lägga upp"
+msgstr "Maximal storlek att ladda upp"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "max. möjligt:"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Krävs för nerladdning av flera mappar och filer"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Aktivera ZIP-nerladdning"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 är lika med oändligt"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Största tillåtna storlek för ZIP filer"
 
 #: templates/index.php:7
 msgid "New"
@@ -95,7 +149,7 @@ msgstr "Mapp"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "Från webbadress"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -103,7 +157,7 @@ msgstr "Ladda upp"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Avbryt uppladdning"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -115,24 +169,12 @@ msgstr "Namn"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Dela"
 
 #: templates/index.php:51
 msgid "Download"
 msgstr "Ladda ned"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Storlek"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Ändrad"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Ta bort"
@@ -149,8 +191,8 @@ msgstr "Filerna du försöker ladda upp överstiger den maximala storleken för
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Filerna skannas, var god vänta"
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Aktuell avsökning"
diff --git a/l10n/sv/gallery.po b/l10n/sv/gallery.po
index c8542142b5..8af72bc519 100644
--- a/l10n/sv/gallery.po
+++ b/l10n/sv/gallery.po
@@ -5,12 +5,13 @@
 # Translators:
 # Christer Eriksson <post@hc3web.com>, 2012.
 #   <revoltism@gmail.com>, 2012.
+#   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +20,48 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
+msgstr "Bilder"
+
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Inställningar"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
 msgstr ""
 
 #: templates/index.php:16
@@ -29,15 +70,11 @@ msgstr "Sök igen"
 
 #: templates/index.php:17
 msgid "Stop"
-msgstr ""
+msgstr "Stoppa"
 
 #: templates/index.php:18
 msgid "Share"
-msgstr ""
-
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
+msgstr "Dela"
 
 #: templates/view_album.php:19
 msgid "Back"
@@ -45,16 +82,16 @@ msgstr "Tillbaka"
 
 #: templates/view_album.php:36
 msgid "Remove confirmation"
-msgstr ""
+msgstr "Vill du säkert ta bort"
 
 #: templates/view_album.php:37
 msgid "Do you want to remove album"
-msgstr ""
+msgstr "Vill du ta bort albumet"
 
 #: templates/view_album.php:40
 msgid "Change album name"
-msgstr ""
+msgstr "Ändra albumnamnet"
 
 #: templates/view_album.php:43
 msgid "New album name"
-msgstr ""
+msgstr "Albumnamn"
diff --git a/l10n/sv/media.po b/l10n/sv/media.po
index e3cf2e1778..b5dc072040 100644
--- a/l10n/sv/media.po
+++ b/l10n/sv/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Musik"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Spela"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Paus"
 
@@ -34,7 +38,7 @@ msgstr "Paus"
 msgid "Previous"
 msgstr "Föregående"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Nästa"
 
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 18a6cffa3f..557d08cbe8 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -6,12 +6,13 @@
 # Christer Eriksson <post@hc3web.com>, 2012.
 #   <hakan.thn@gmail.com>, 2011.
 #   <revoltism@gmail.com>, 2011, 2012.
+#   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -21,57 +22,76 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "Epost ändrad"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Ogiltig begäran"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID ändrat"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Ogiltig begäran"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Språk ändrades"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "Logg"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "Mera"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "Lägg till din applikation"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "Välj en App"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-licensierat"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "av"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentation"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Hantering av stora filer"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -99,11 +119,11 @@ msgstr "av tillgängliga"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Synkroniseringsklienter för dator och mobil"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Ladda ner"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -171,11 +191,11 @@ msgstr "Skapa"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "Förvald datakvot"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "Annat"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 8fd8f393f2..a55aacd870 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: appinfo/app.php:16
+#: appinfo/app.php:14
 msgid "Bookmarks"
 msgstr ""
 
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index c1ec762cb1..bab1046758 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,16 +41,40 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr ""
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 84598402cd..15859a85e5 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -81,23 +81,20 @@ msgstr ""
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -121,14 +118,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -145,7 +174,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,102 +190,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at bugs."
+"owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -427,6 +583,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -583,7 +743,7 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -611,27 +771,21 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br /"
+">Please upload your VCF file with the file manager and click on it to import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 18d15c38dc..46ee521dfa 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,6 +29,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr ""
@@ -159,15 +235,15 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index d3d0f0a57d..d38e5942c2 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -47,10 +47,62 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr ""
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr ""
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -119,18 +171,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:55
-msgid "Size"
-msgstr ""
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr ""
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr ""
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index b81b86d3c0..0cf2a7db97 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,50 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr ""
@@ -33,10 +73,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr ""
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 94331c8a87..b722f87d43 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,6 +21,10 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index c349a9548f..85b693c5c0 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,23 +18,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
 msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr ""
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr ""
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr ""
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -55,10 +70,14 @@ msgid "Select an App"
 msgstr ""
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr ""
 
diff --git a/l10n/th_TH/calendar.po b/l10n/th_TH/calendar.po
index e79d87ac5c..85bdc87fc0 100644
--- a/l10n/th_TH/calendar.po
+++ b/l10n/th_TH/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 12:30+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,16 +43,40 @@ msgstr "โซนเวลาถูกเปลี่ยนแล้ว"
 msgid "Invalid request"
 msgstr "คำร้องขอไม่ถูกต้อง"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "ปฏิทิน"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "วันเกิด"
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
index 57e3930907..c97c27d4e9 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -83,23 +83,20 @@ msgstr "เกิดข้อผิดพลาดในการเพิ่ม
 msgid "Error activating addressbook."
 msgstr "เกิดข้อผิดพลาดในการเปิดใช้งานสมุดบันทึกที่อยู่"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "ไม่มีรหัสข้อมูลการติดต่อถูกส่งมา"
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "เกิดข้อผิดพลาดในการโหลดรูปภาพ"
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "เกิดข้อผิดพลาดในการอ่านรูปภาพของข้อมูลการติดต่อ"
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "เกิดข้อผิดพลาดในการบันทึกไฟล์ชั่วคราว"
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "โหลดรูปภาพไม่ถูกต้อง"
 
@@ -123,14 +120,46 @@ msgstr "รหัสข้อมูลการติดต่อเกิดก
 msgid "Missing contact id."
 msgstr "รหัสข้อมูลการติดต่อเกิดการสูญหาย"
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "ไม่พบตำแหน่งพาธของรูปภาพ"
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "ไม่มีไฟล์ดังกล่าว"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "เกิดข้อผิดพลาดในการโหลดรูปภาพ"
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "ยังไม่ได้กำหนดชื่อ"
@@ -147,7 +176,7 @@ msgstr "ข้อมูล vCard ไม่ถูกต้อง กรุณา
 msgid "Something went FUBAR. "
 msgstr "มีบางอย่างเกิดการ FUBAR. "
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "เกิดข้อผิดพลาดในการอัพเดทข้อมูลการติดต่อ"
 
@@ -163,102 +192,229 @@ msgstr "เกิดข้อผิดพลาดในการอัพเด
 msgid "Error uploading contacts to storage."
 msgstr "เกิดข้อผิดพลาดในการอัพโหลดข้อมูลการติดต่อไปยังพื้นที่จัดเก็บข้อมูล"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "ไม่พบข้อผิดพลาดใดๆ, ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง upload_max_filesize ที่อยู่ในไฟล์ php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง MAX_FILE_SIZE ที่ถูกระบุไว้ในรูปแบบของ HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "ไฟล์ถูกอัพโหลดได้เพียงบางส่วนเท่านั้น"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "ไม่มีไฟล์ที่ถูกอัพโหลด"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "โฟลเดอร์ชั่วคราวเกิดการสูญหาย"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "ข้อมูลการติดต่อ"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "วางไฟล์ VCF ที่ต้องการนำเข้าข้อมูลการติดต่อ"
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ"
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ"
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "ไม่พบข้อมูลการติดต่อ"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "ที่อยู่"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "โทรศัพท์"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "อีเมล์"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "หน่วยงาน"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "ที่ทำงาน"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "บ้าน"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "มือถือ"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "ข้อความ"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "เสียงพูด"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "ข้อความ"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "โทรสาร"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "วีดีโอ"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "เพจเจอร์"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "อินเทอร์เน็ต"
 
@@ -429,6 +585,10 @@ msgstr "อัพโหลดรูปภาพใหม่"
 msgid "Select photo from ownCloud"
 msgstr "เลือกรูปภาพจาก ownCloud"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "แก้ไขที่อยู่"
@@ -585,7 +745,7 @@ msgid "Submit"
 msgstr "ส่งข้อมูล"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "ยกเลิก"
 
@@ -613,27 +773,22 @@ msgstr "นำเข้า"
 msgid "Importing contacts"
 msgstr "นำเข้าข้อมูลการติดต่อ"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "ข้อมูลการติดต่อถูกนำเข้าข้อมูลเรียบร้อยแล้ว"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "ปิดกล่องข้อความ"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "นำเข้าข้อมูลสมุดบันทึกที่อยู่"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "เลือกสมุดบันทึกที่อยู่ที่ต้องการนำเข้า:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "วางไฟล์ VCF ที่ต้องการนำเข้าข้อมูลการติดต่อ"
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "เลือกจากฮาร์ดดิส"
 
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 54854376e7..43e255b71f 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 12:35+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,6 +31,82 @@ msgstr "ไม่มีหมวดหมู่ที่ต้องการเ
 msgid "This category already exists: "
 msgstr "หมวดหมู่นี้มีอยู่แล้ว: "
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "เปลี่ยนรหัสผ่านใน Owncloud"
@@ -161,15 +237,15 @@ msgstr "Database host"
 msgid "Finish setup"
 msgstr "ติดตั้งเรียบร้อยแล้ว"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "ออกจากระบบ"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "ตั้งค่า"
 
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 74001582a8..5e8c76459a 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 12:33+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "แฟ้มเอกสารชั่วคราวเกิดกา
 msgid "Failed to write to disk"
 msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "ไฟล์"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "ขนาด"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "ปรับปรุงล่าสุด"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "การจัดกาไฟล์"
@@ -121,18 +173,6 @@ msgstr "แชร์"
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "ขนาด"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "ปรับปรุงล่าสุด"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "ลบทั้งหมด"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "ลบ"
diff --git a/l10n/th_TH/gallery.po b/l10n/th_TH/gallery.po
index 277830cd2b..1a8ef7a619 100644
--- a/l10n/th_TH/gallery.po
+++ b/l10n/th_TH/gallery.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 12:24+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,50 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "รูปภาพ"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "ตั้งค่า"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "ตรวจสอบอีกครั้ง"
@@ -35,10 +75,6 @@ msgstr "หยุด"
 msgid "Share"
 msgstr "แชร์"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "ตั้งค่า"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "ย้อนกลับ"
diff --git a/l10n/th_TH/media.po b/l10n/th_TH/media.po
index f486a4609f..d59e3cc7c0 100644
--- a/l10n/th_TH/media.po
+++ b/l10n/th_TH/media.po
@@ -7,26 +7,30 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-16 17:33+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywherer@gmail.com>\n"
-"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/team/th_TH/)\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "เพลง"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "เล่น"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "หยุดชั่วคราว"
 
@@ -34,7 +38,7 @@ msgstr "หยุดชั่วคราว"
 msgid "Previous"
 msgstr "ก่อนหน้า"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "ถัดไป"
 
@@ -61,5 +65,3 @@ msgstr "อัลบั้ม"
 #: templates/music.php:39
 msgid "Title"
 msgstr "ชื่อ"
-
-
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index b726c8143f..b753a75150 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 12:26+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,23 +21,38 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "อีเมล์ถูกเปลี่ยนแล้ว"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "คำร้องขอไม่ถูกต้อง"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "เปลี่ยนชื่อบัญชี OpenID แล้ว"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "คำร้องขอไม่ถูกต้อง"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "เปลี่ยนภาษาเรียบร้อยแล้ว"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "ภาษาไทย"
 
@@ -58,10 +73,14 @@ msgid "Select an App"
 msgstr "เลือก App"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-ได้รับอนุญาติแล้ว"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "โดย"
 
diff --git a/l10n/tr/calendar.po b/l10n/tr/calendar.po
index 31f3d4b68c..65932f70ee 100644
--- a/l10n/tr/calendar.po
+++ b/l10n/tr/calendar.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 11:01+0000\n"
-"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,16 +44,40 @@ msgstr "Zaman dilimi değiştirildi"
 msgid "Invalid request"
 msgstr "Geçersiz istek"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Takvim"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "AAA g[ yyyy]{ '&#8212;'[ AAA] g yyyy}"
 
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
 #: lib/app.php:125
 msgid "Birthday"
 msgstr "Doğum günü"
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index 462a165eb2..ca306b53c2 100644
--- a/l10n/tr/contacts.po
+++ b/l10n/tr/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -83,23 +83,20 @@ msgstr "Adres defteri eklenirken hata oluştu."
 msgid "Error activating addressbook."
 msgstr "Adres defteri etkinleştirilirken hata oluştu."
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr "Bağlantı ID'si girilmedi."
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "İmaj yükleme hatası."
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "Bağlantı fotoğrafı okunamadı."
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "Geçici dosya kaydetme hatası."
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr "Yüklenecek fotograf geçerli değil."
 
@@ -123,14 +120,46 @@ msgstr "Bağlantı ID'si eksik."
 msgid "Missing contact id."
 msgstr "Eksik bağlantı id'si."
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr "Fotoğraf girilmedi."
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "Dosya mevcut değil:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "İmaj yükleme hatası."
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr "eleman ismi atanmamış."
@@ -147,7 +176,7 @@ msgstr "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: "
 msgid "Something went FUBAR. "
 msgstr "Bir şey FUBAR gitti."
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "Kişi özelliği güncellenirken hata oluştu."
 
@@ -163,102 +192,229 @@ msgstr "Adres defteri güncellenirken hata oluştu."
 msgid "Error uploading contacts to storage."
 msgstr "Bağlantıları depoya yükleme hatası"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr "Dosya başarıyla yüklendi, hata oluşmadı"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Dosyanın boyutu php.ini dosyasındaki upload_max_filesize limitini aşıyor"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limitini aşıyor"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "Dosya kısmen karşıya yüklenebildi"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "Hiç dosya gönderilmedi"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr "Geçici dizin eksik"
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "Kişiler"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr "Bağlantıları içe aktarmak için bir VCF dosyası bırakın."
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "Adres defteri bulunamadı."
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Bu sizin adres defteriniz değil."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "Kişi bulunamadı."
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Eposta"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Organizasyon"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "İş"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "Ev"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Metin"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Ses"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "mesaj"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Sayfalayıcı"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "İnternet"
 
@@ -429,6 +585,10 @@ msgstr "Yeni fotoğraf yükle"
 msgid "Select photo from ownCloud"
 msgstr "ownCloud'dan bir fotoğraf seç"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "Adresi düzenle"
@@ -585,7 +745,7 @@ msgid "Submit"
 msgstr "Gönder"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "İptal"
 
@@ -613,27 +773,22 @@ msgstr "İçe aktar"
 msgid "Importing contacts"
 msgstr "Bağlantıları içe aktar"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "Bağlantılar başarıyla içe aktarıldı"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "Diyaloğu kapat"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
-msgstr "Adres defterini içeri aktar"
+msgid "Close"
+msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr "İçe aktarılacak adres defterini seçin:"
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr "Bağlantıları içe aktarmak için bir VCF dosyası bırakın."
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr "HD'den seç"
 
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 97183a80b4..ac6e6dec29 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 06:54+0000\n"
-"Last-Translator: Aranel Surion <aranel@aranelsurion.org>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,6 +30,82 @@ msgstr "Eklenecek kategori yok?"
 msgid "This category already exists: "
 msgstr "Bu kategori zaten mevcut: "
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "Owncloud parola sıfırlama"
@@ -160,15 +236,15 @@ msgstr "Veritabanı sunucusu"
 msgid "Finish setup"
 msgstr "Kurulumu tamamla"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "kontrolünüzdeki web servisleri"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Çıkış yap"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Ayarlar"
 
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 3c400f699c..94f7c3d109 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 09:42+0000\n"
-"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "Geçici bir klasör eksik"
 msgid "Failed to write to disk"
 msgstr "Diske yazılamadı"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Dosyalar"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Boyut"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Değiştirilme"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Dosya taşıma"
@@ -121,18 +173,6 @@ msgstr "Paylaş"
 msgid "Download"
 msgstr "İndir"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Boyut"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Değiştirilme"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Hepsini sil"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Sil"
diff --git a/l10n/tr/gallery.po b/l10n/tr/gallery.po
index 90a706647b..d13585d1eb 100644
--- a/l10n/tr/gallery.po
+++ b/l10n/tr/gallery.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 06:53+0000\n"
-"Last-Translator: Aranel Surion <aranel@aranelsurion.org>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,50 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "Resimler"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "Ayarlar"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Yeniden Tara "
@@ -35,10 +75,6 @@ msgstr "Durdur"
 msgid "Share"
 msgstr "Paylaş"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "Ayarlar"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Geri"
diff --git a/l10n/tr/media.po b/l10n/tr/media.po
index 1c235dd80d..0d9a91d218 100644
--- a/l10n/tr/media.po
+++ b/l10n/tr/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "Müzik"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "Oynat"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "Beklet"
 
@@ -34,7 +38,7 @@ msgstr "Beklet"
 msgid "Previous"
 msgstr "Önceki"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "Sonraki"
 
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 06d49d28e2..3ffe00954d 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 06:55+0000\n"
-"Last-Translator: Aranel Surion <aranel@aranelsurion.org>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,23 +19,38 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "eposta Değiştirildi"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "Geçersiz istek"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID Değiştirildi"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "Geçersiz istek"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "Dil değiştirildi"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__dil_adı__"
 
@@ -56,10 +71,14 @@ msgid "Select an App"
 msgstr "Bir uygulama seçin"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-lisanslı"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "yapan"
 
diff --git a/l10n/uk/calendar.po b/l10n/uk/calendar.po
index e4e6c62963..f2eab41a95 100644
--- a/l10n/uk/calendar.po
+++ b/l10n/uk/calendar.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -42,77 +42,101 @@ msgstr "Часовий пояс змінено"
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Календар"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: lib/app.php:122
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:125
 msgid "Birthday"
 msgstr "День народження"
 
-#: lib/app.php:123
+#: lib/app.php:126
 msgid "Business"
 msgstr "Справи"
 
-#: lib/app.php:124
+#: lib/app.php:127
 msgid "Call"
 msgstr "Подзвонити"
 
-#: lib/app.php:125
+#: lib/app.php:128
 msgid "Clients"
 msgstr "Клієнти"
 
-#: lib/app.php:126
+#: lib/app.php:129
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:130
 msgid "Holidays"
 msgstr "Свята"
 
-#: lib/app.php:128
+#: lib/app.php:131
 msgid "Ideas"
 msgstr "Ідеї"
 
-#: lib/app.php:129
+#: lib/app.php:132
 msgid "Journey"
 msgstr "Поїздка"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Jubilee"
 msgstr "Ювілей"
 
-#: lib/app.php:131
+#: lib/app.php:134
 msgid "Meeting"
 msgstr "Зустріч"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Other"
 msgstr "Інше"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Personal"
 msgstr "Особисте"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Projects"
 msgstr "Проекти"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Questions"
 msgstr "Запитання"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Work"
 msgstr "Робота"
 
-#: lib/app.php:377
+#: lib/app.php:380
 msgid "unnamed"
 msgstr ""
 
diff --git a/l10n/uk/contacts.po b/l10n/uk/contacts.po
index 3112261ed7..e284cb8b0f 100644
--- a/l10n/uk/contacts.po
+++ b/l10n/uk/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -82,23 +82,20 @@ msgstr "Помилка при додаванні адресної книги."
 msgid "Error activating addressbook."
 msgstr ""
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,14 +119,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -146,7 +175,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr ""
 
@@ -162,102 +191,229 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "Це не ваша адресна книга."
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "Ел.пошта"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "Організація"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Мобільний"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Голос"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "Відео"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "Пейджер"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr ""
 
@@ -428,6 +584,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -584,7 +744,7 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -612,27 +772,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 167fc45cdc..fe1c962318 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:31+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -31,6 +31,82 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr ""
@@ -161,15 +237,15 @@ msgstr ""
 msgid "Finish setup"
 msgstr "Завершити налаштування"
 
-#: templates/layout.guest.php:37
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "веб-сервіс під вашим контролем"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "Вихід"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "Налаштування"
 
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 58f45d3ac5..4019b885f5 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -49,10 +49,62 @@ msgstr "Відсутній тимчасовий каталог"
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Файли"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Розмір"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Змінено"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -121,18 +173,6 @@ msgstr ""
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Розмір"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Змінено"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr ""
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Видалити"
diff --git a/l10n/uk/gallery.po b/l10n/uk/gallery.po
index 12fdf9a330..a29e3a1312 100644
--- a/l10n/uk/gallery.po
+++ b/l10n/uk/gallery.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:33+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr ""
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr ""
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "Оновити"
@@ -34,10 +74,6 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr ""
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "Назад"
diff --git a/l10n/uk/media.po b/l10n/uk/media.po
index 5f7b442b17..5df57e8565 100644
--- a/l10n/uk/media.po
+++ b/l10n/uk/media.po
@@ -6,26 +6,30 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-24 00:25+0100\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/team/uk/)\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr ""
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr ""
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr ""
 
@@ -33,7 +37,7 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr ""
 
@@ -60,5 +64,3 @@ msgstr ""
 #: templates/music.php:39
 msgid "Title"
 msgstr ""
-
-
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 92adb4dc7d..3e271d5055 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -18,23 +18,38 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
+msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
 msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr ""
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr ""
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr ""
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -55,10 +70,14 @@ msgid "Select an App"
 msgstr ""
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr ""
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr ""
 
diff --git a/l10n/zh_CN/calendar.po b/l10n/zh_CN/calendar.po
index 743ec435b1..5353f15cdb 100644
--- a/l10n/zh_CN/calendar.po
+++ b/l10n/zh_CN/calendar.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <rainofchaos@gmail.com>, 2012.
 #   <wengxt@gmail.com>, 2011, 2012.
+# 冰 蓝 <lanbing89@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 23:50+0000\n"
-"Last-Translator: csslayer <wengxt@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,14 +44,38 @@ msgstr "时区已修改"
 msgid "Invalid request"
 msgstr "非法请求"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "日历"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
 msgstr ""
 
 #: lib/app.php:125
@@ -450,7 +476,7 @@ msgstr "重复"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "提醒"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
@@ -607,11 +633,11 @@ msgstr "选择分类"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "在"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "在"
 
 #: templates/settings.php:14
 msgid "Timezone"
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index f7e92dfd66..7d48fb931a 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <rainofchaos@gmail.com>, 2012.
 #   <wengxt@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +37,7 @@ msgstr "至少需要填写一项地址。"
 
 #: ajax/addproperty.php:62
 msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "试图添加重复属性： "
 
 #: ajax/addproperty.php:120
 msgid "Error adding contact property."
@@ -44,7 +45,7 @@ msgstr "添加联系人属性错误。"
 
 #: ajax/categories/categoriesfor.php:15
 msgid "No ID provided"
-msgstr ""
+msgstr "未提供 ID"
 
 #: ajax/categories/categoriesfor.php:27
 msgid "Error setting checksum."
@@ -52,7 +53,7 @@ msgstr "设置校验值错误。"
 
 #: ajax/categories/delete.php:29
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "未选中要删除的分类。"
 
 #: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
 msgid "No address books found."
@@ -68,11 +69,11 @@ msgstr "缺少 ID"
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "无法解析如下ID的 VCard：“"
 
 #: ajax/createaddressbook.php:18
 msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "无法无姓名的地址簿。"
 
 #: ajax/createaddressbook.php:24
 msgid "Error adding addressbook."
@@ -82,25 +83,22 @@ msgstr "添加地址簿错误。"
 msgid "Error activating addressbook."
 msgstr "激活地址簿错误。"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "未提交联系人 ID。"
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr "加载图片错误。"
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr "读取联系人照片错误。"
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr "保存临时文件错误。"
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
-msgstr ""
+msgstr "装入的照片不正确。"
 
 #: ajax/deletecard.php:37 ajax/saveproperty.php:58
 msgid "id is not set."
@@ -122,14 +120,46 @@ msgstr "缺少联系人 ID。"
 msgid "Missing contact id."
 msgstr "缺少联系人 ID。"
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
-msgstr ""
+msgstr "未提供照片路径。"
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr "文件不存在:"
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr "加载图片错误。"
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -146,7 +176,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "更新联系人属性错误。"
 
@@ -162,102 +192,229 @@ msgstr "更新地址簿错误"
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr "已上传文件只上传了部分"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
 msgstr "没有文件被上传"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
+msgstr "缺少临时目录"
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "联系人"
 
-#: lib/app.php:23
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
 msgid "Addressbook not found."
 msgstr "未找到地址簿。"
 
-#: lib/app.php:27
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "这不是您的地址簿。"
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "无法找到联系人。"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "地址"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "电话"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "电子邮件"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "组织"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "工作"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "家庭"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "移动电话"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "文本"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "语音"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
-msgstr ""
+msgstr "消息"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "传真"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "视频"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "传呼机"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "互联网"
 
@@ -318,7 +475,7 @@ msgstr "删除联系人"
 
 #: templates/part.contact.php:19
 msgid "Drop photo to upload"
-msgstr ""
+msgstr "拖拽图片进行上传"
 
 #: templates/part.contact.php:29
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
@@ -326,7 +483,7 @@ msgstr ""
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "编辑名称详情"
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
@@ -394,15 +551,15 @@ msgstr "编辑地址细节。"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "添加注释。"
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "添加字段"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "联系人图片"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -410,7 +567,7 @@ msgstr "电话"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "注释"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
@@ -428,6 +585,10 @@ msgstr "上传新照片"
 msgid "Select photo from ownCloud"
 msgstr "从 ownCloud 选择照片"
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr "编辑地址"
@@ -584,7 +745,7 @@ msgid "Submit"
 msgstr "提交"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "取消"
 
@@ -612,27 +773,22 @@ msgstr "导入"
 msgid "Importing contacts"
 msgstr "导入联系人"
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr "联系人导入成功"
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr "关闭对话框"
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
@@ -642,15 +798,15 @@ msgstr ""
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "添加联系人"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
-msgstr ""
+msgstr "配置地址簿"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing addresses"
-msgstr ""
+msgstr "CardDAV 同步地址"
 
 #: templates/settings.php:4
 msgid "more info"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index e9f69c4c79..54f452ded2 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 20:53+0000\n"
-"Last-Translator: csslayer <wengxt@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,6 +30,82 @@ msgstr "没有可添加分类？"
 msgid "This category already exists: "
 msgstr "此分类已存在: "
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "重置 Owncloud 密码"
@@ -160,15 +236,15 @@ msgstr "数据库主机"
 msgid "Finish setup"
 msgstr "安装完成"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "由您掌控的网络服务"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "注销"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "设置"
 
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 5d85d3c8a9..7410d7462d 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 21:07+0000\n"
-"Last-Translator: csslayer <wengxt@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,10 +48,62 @@ msgstr "缺少临时目录"
 msgid "Failed to write to disk"
 msgstr "写入磁盘失败"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "文件"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "大小"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "修改日期"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "文件处理"
@@ -120,18 +172,6 @@ msgstr "共享"
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "大小"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "修改日期"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "删除所有"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "删除"
diff --git a/l10n/zh_CN/gallery.po b/l10n/zh_CN/gallery.po
index f6c2a58818..23d106c760 100644
--- a/l10n/zh_CN/gallery.po
+++ b/l10n/zh_CN/gallery.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-09 20:55+0000\n"
-"Last-Translator: csslayer <wengxt@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,50 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "图片"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "设置"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "重新扫描"
@@ -35,10 +75,6 @@ msgstr "停止"
 msgid "Share"
 msgstr "分享"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "设置"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "返回"
diff --git a/l10n/zh_CN/media.po b/l10n/zh_CN/media.po
index f59cf4210d..1990c3e2be 100644
--- a/l10n/zh_CN/media.po
+++ b/l10n/zh_CN/media.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-02-14 09:15+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "音乐"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "播放"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "暂停"
 
@@ -34,7 +38,7 @@ msgstr "暂停"
 msgid "Previous"
 msgstr "前一首"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "后一首"
 
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index a9cd39e03e..c566e5d060 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <rainofchaos@gmail.com>, 2012.
 #   <wengxt@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-05-09 10:32+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -19,57 +20,76 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "电子邮件已修改"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "非法请求"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID 已修改"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "非法请求"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "语言已修改"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "简体中文"
 
 #: templates/admin.php:13
 msgid "Log"
-msgstr ""
+msgstr "日志"
 
 #: templates/admin.php:40
 msgid "More"
-msgstr ""
+msgstr "更多"
 
 #: templates/apps.php:8
 msgid "Add your App"
-msgstr ""
+msgstr "添加应用"
 
 #: templates/apps.php:22
 msgid "Select an App"
 msgstr "选择一个应用"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-许可证"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "由"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "文档"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
-msgstr ""
+msgstr "管理大文件"
 
 #: templates/help.php:10
 msgid "Ask a question"
@@ -97,11 +117,11 @@ msgstr "的空间，总容量为"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "桌面和移动设备同步程序"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "下载"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -169,11 +189,11 @@ msgstr "创建"
 
 #: templates/users.php:25
 msgid "Default Quota"
-msgstr ""
+msgstr "默认配额"
 
 #: templates/users.php:35 templates/users.php:74
 msgid "Other"
-msgstr ""
+msgstr "其它"
 
 #: templates/users.php:47
 msgid "Quota"
diff --git a/l10n/zh_TW/calendar.po b/l10n/zh_TW/calendar.po
index 9f25d33271..60f1e1c802 100644
--- a/l10n/zh_TW/calendar.po
+++ b/l10n/zh_TW/calendar.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Donahue Chuang <soshinwu@gmail.com>, 2012.
+# Eddy Chang <taiwanmambo@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 10:34+0000\n"
-"Last-Translator: Donahue Chuang <soshinwu@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +21,11 @@ msgstr ""
 
 #: ajax/categories/rescan.php:28
 msgid "No calendars found."
-msgstr ""
+msgstr "沒有找到行事曆"
 
 #: ajax/categories/rescan.php:36
 msgid "No events found."
-msgstr ""
+msgstr "沒有找到活動"
 
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
@@ -42,14 +43,38 @@ msgstr "時區已變更"
 msgid "Invalid request"
 msgstr "無效請求"
 
-#: appinfo/app.php:23 templates/calendar.php:15
+#: appinfo/app.php:19 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:31
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "日曆"
 
-#: js/calendar.js:788
+#: js/calendar.js:93
+msgid "Deletion failed"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
 msgstr ""
 
 #: lib/app.php:125
@@ -114,7 +139,7 @@ msgstr "工作"
 
 #: lib/app.php:380
 msgid "unnamed"
-msgstr ""
+msgstr "無名稱的"
 
 #: lib/object.php:330
 msgid "Does not repeat"
@@ -158,7 +183,7 @@ msgstr "由日期"
 
 #: lib/object.php:352
 msgid "by monthday"
-msgstr ""
+msgstr "依月份日期"
 
 #: lib/object.php:353
 msgid "by weekday"
@@ -194,7 +219,7 @@ msgstr "週日"
 
 #: lib/object.php:373
 msgid "events week of month"
-msgstr ""
+msgstr "月份中活動週"
 
 #: lib/object.php:374
 msgid "first"
@@ -274,7 +299,7 @@ msgstr "由事件日期"
 
 #: lib/object.php:419
 msgid "by yearday(s)"
-msgstr ""
+msgstr "依年份日期"
 
 #: lib/object.php:420
 msgid "by weeknumber(s)"
@@ -290,7 +315,7 @@ msgstr "日期"
 
 #: lib/search.php:40
 msgid "Cal."
-msgstr ""
+msgstr "行事曆"
 
 #: templates/calendar.php:11
 msgid "All day"
@@ -363,7 +388,7 @@ msgstr "選擇一個作用中的日曆"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "你的行事曆"
 
 #: templates/part.choosecalendar.php:27
 #: templates/part.choosecalendar.rowfields.php:5
@@ -372,15 +397,15 @@ msgstr "CalDav 聯結"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "分享的行事曆"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "不分享的行事曆"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Share Calendar"
-msgstr ""
+msgstr "分享行事曆"
 
 #: templates/part.choosecalendar.rowfields.php:6
 msgid "Download"
@@ -397,7 +422,7 @@ msgstr "刪除"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "分享給你由"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -442,11 +467,11 @@ msgstr "匯出"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "活動資訊"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "重覆中"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
@@ -470,11 +495,11 @@ msgstr "分類"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "用逗點分隔分類"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "編輯分類"
 
 #: templates/part.eventform.php:56 templates/part.showevent.php:55
 msgid "All Day Event"
@@ -527,11 +552,11 @@ msgstr "選擇日"
 
 #: templates/part.eventform.php:169 templates/part.showevent.php:167
 msgid "and the events day of year."
-msgstr ""
+msgstr "以及年中的活動日"
 
 #: templates/part.eventform.php:182 templates/part.showevent.php:180
 msgid "and the events day of month."
-msgstr ""
+msgstr "以及月中的活動日"
 
 #: templates/part.eventform.php:190 templates/part.showevent.php:188
 msgid "Select months"
@@ -543,7 +568,7 @@ msgstr "選擇週"
 
 #: templates/part.eventform.php:208 templates/part.showevent.php:206
 msgid "and the events week of year."
-msgstr ""
+msgstr "以及年中的活動週"
 
 #: templates/part.eventform.php:214 templates/part.showevent.php:212
 msgid "Interval"
@@ -595,11 +620,11 @@ msgstr "建立一個新事件"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "觀看一個活動"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
+msgstr "沒有選擇分類"
 
 #: templates/part.showevent.php:25
 msgid "Select category"
@@ -607,11 +632,11 @@ msgstr "選擇分類"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "於"
 
 #: templates/part.showevent.php:62 templates/part.showevent.php:70
 msgid "at"
-msgstr ""
+msgstr "於"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -635,7 +660,7 @@ msgstr "12小時制"
 
 #: templates/settings.php:40
 msgid "First day of the week"
-msgstr ""
+msgstr "每週的第一天"
 
 #: templates/settings.php:49
 msgid "Calendar CalDAV syncing address:"
@@ -663,4 +688,4 @@ msgstr "選擇群組"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "公開"
diff --git a/l10n/zh_TW/contacts.po b/l10n/zh_TW/contacts.po
index 0e0a28e549..9d49e670c5 100644
--- a/l10n/zh_TW/contacts.po
+++ b/l10n/zh_TW/contacts.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Donahue Chuang <soshinwu@gmail.com>, 2012.
+# Eddy Chang <taiwanmambo@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-13 17:52+0000\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -60,11 +61,11 @@ msgstr ""
 
 #: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
 msgid "No contacts found."
-msgstr ""
+msgstr "沒有找到聯絡人"
 
 #: ajax/contactdetails.php:37
 msgid "Missing ID"
-msgstr ""
+msgstr "遺失ID"
 
 #: ajax/contactdetails.php:41
 msgid "Error parsing VCard for ID: \""
@@ -82,23 +83,20 @@ msgstr "添加電話簿中發生錯誤"
 msgid "Error activating addressbook."
 msgstr "啟用電話簿中發生錯誤"
 
-#: ajax/currentphoto.php:40 ajax/oc_photo.php:40
+#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
+#: ajax/uploadphoto.php:68
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:47 ajax/oc_photo.php:57 ajax/oc_photo.php:60
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:40
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:61
+#: ajax/currentphoto.php:52
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:64
+#: ajax/currentphoto.php:55
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,14 +120,46 @@ msgstr ""
 msgid "Missing contact id."
 msgstr ""
 
-#: ajax/oc_photo.php:44
+#: ajax/oc_photo.php:41
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:51
+#: ajax/oc_photo.php:48
 msgid "File doesn't exist:"
 msgstr ""
 
+#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:68
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:75
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:88
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:101
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:104
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:107
+msgid "Error finding image: "
+msgstr ""
+
 #: ajax/saveproperty.php:55
 msgid "element name is not set."
 msgstr ""
@@ -146,7 +176,7 @@ msgstr ""
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:153
+#: ajax/saveproperty.php:150
 msgid "Error updating contact property."
 msgstr "更新通訊錄內容中發生錯誤"
 
@@ -162,108 +192,235 @@ msgstr "電話簿更新中發生錯誤"
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:85
+#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:86
+#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:87
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:88
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:89
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
 msgid "No file was uploaded"
-msgstr ""
+msgstr "沒有已上傳的檔案"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:90
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:22 templates/settings.php:3
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:17 templates/settings.php:3
 msgid "Contacts"
 msgstr "通訊錄"
 
-#: lib/app.php:23
-msgid "Addressbook not found."
+#: js/contacts.js:24
+msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: lib/app.php:27
+#: js/contacts.js:24
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:29
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
+#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
+#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
+#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
+#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
+#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
+#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
+#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
+#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
+#: js/contacts.js:1654 js/contacts.js:1657
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+
+#: js/contacts.js:364
+msgid "Warning"
+msgstr ""
+
+#: js/contacts.js:605
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:631
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:747 js/contacts.js:765
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:781
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1056
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1119
+msgid "Select photo"
+msgstr ""
+
+#: js/contacts.js:1257 js/contacts.js:1290
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1305 templates/part.importaddressbook.php:25
+msgid "Drop a VCF file to import contacts."
+msgstr ""
+
+#: js/contacts.js:1475
+msgid "Import done. Success/Failure: "
+msgstr ""
+
+#: js/contacts.js:1476
+msgid "OK"
+msgstr ""
+
+#: js/contacts.js:1494
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: js/contacts.js:1634
+msgid "Upload too large"
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Only image files can be used as profile picture."
+msgstr ""
+
+#: js/contacts.js:1638
+msgid "Wrong file type"
+msgstr ""
+
+#: js/contacts.js:1644
+msgid ""
+"Your browser doesn't support AJAX upload. Please click on the profile "
+"picture to select a photo to upload."
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:30
+msgid "Addressbook not found."
+msgstr "找不到通訊錄"
+
+#: lib/app.php:34
 msgid "This is not your addressbook."
 msgstr "這不是你的電話簿"
 
-#: lib/app.php:38
+#: lib/app.php:45
 msgid "Contact could not be found."
 msgstr "通訊錄未發現"
 
-#: lib/app.php:94 templates/part.contact.php:109
+#: lib/app.php:101 templates/part.contact.php:109
 msgid "Address"
 msgstr "地址"
 
-#: lib/app.php:95
+#: lib/app.php:102
 msgid "Telephone"
 msgstr "電話"
 
-#: lib/app.php:96 templates/part.contact.php:108
+#: lib/app.php:103 templates/part.contact.php:108
 msgid "Email"
 msgstr "電子郵件"
 
-#: lib/app.php:97 templates/part.contact.php:33 templates/part.contact.php:34
+#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
 #: templates/part.contact.php:104
 msgid "Organization"
 msgstr "組織"
 
-#: lib/app.php:109 lib/app.php:116 lib/app.php:126
+#: lib/app.php:116 lib/app.php:123 lib/app.php:133
 msgid "Work"
 msgstr "公司"
 
-#: lib/app.php:110 lib/app.php:114 lib/app.php:127
+#: lib/app.php:117 lib/app.php:121 lib/app.php:134
 msgid "Home"
 msgstr "住宅"
 
-#: lib/app.php:115
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "行動電話"
 
-#: lib/app.php:117
+#: lib/app.php:124
 msgid "Text"
 msgstr "文字"
 
-#: lib/app.php:118
+#: lib/app.php:125
 msgid "Voice"
 msgstr "語音"
 
-#: lib/app.php:119
+#: lib/app.php:126
 msgid "Message"
 msgstr "訊息"
 
-#: lib/app.php:120
+#: lib/app.php:127
 msgid "Fax"
 msgstr "傳真"
 
-#: lib/app.php:121
+#: lib/app.php:128
 msgid "Video"
 msgstr "影片"
 
-#: lib/app.php:122
+#: lib/app.php:129
 msgid "Pager"
 msgstr "呼叫器"
 
-#: lib/app.php:128
+#: lib/app.php:135
 msgid "Internet"
 msgstr "網際網路"
 
 #: lib/hooks.php:79
 msgid "{name}'s Birthday"
-msgstr ""
+msgstr "{name}的生日"
 
 #: lib/search.php:22
 msgid "Contact"
@@ -279,7 +436,7 @@ msgstr "電話簿"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "設定通訊錄"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
@@ -287,7 +444,7 @@ msgstr "新電話簿"
 
 #: templates/part.chooseaddressbook.php:17
 msgid "Import from VCF"
-msgstr ""
+msgstr "從VCF匯入"
 
 #: templates/part.chooseaddressbook.php:22
 #: templates/part.chooseaddressbook.rowfields.php:8
@@ -326,7 +483,7 @@ msgstr ""
 
 #: templates/part.contact.php:30
 msgid "Edit name details"
-msgstr ""
+msgstr "編輯姓名詳細資訊"
 
 #: templates/part.contact.php:35 templates/part.contact.php:105
 msgid "Nickname"
@@ -342,7 +499,7 @@ msgstr "生日"
 
 #: templates/part.contact.php:38
 msgid "dd-mm-yyyy"
-msgstr ""
+msgstr "dd-mm-yyyy"
 
 #: templates/part.contact.php:39 templates/part.contact.php:111
 msgid "Groups"
@@ -350,7 +507,7 @@ msgstr "群組"
 
 #: templates/part.contact.php:41
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "用逗號分隔群組"
 
 #: templates/part.contact.php:42
 msgid "Edit groups"
@@ -362,7 +519,7 @@ msgstr "首選"
 
 #: templates/part.contact.php:56
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "註填入合法的電子郵件住址"
 
 #: templates/part.contact.php:56
 msgid "Enter email address"
@@ -370,19 +527,19 @@ msgstr "輸入電子郵件地址"
 
 #: templates/part.contact.php:60
 msgid "Mail to address"
-msgstr ""
+msgstr "寄送住址"
 
 #: templates/part.contact.php:61
 msgid "Delete email address"
-msgstr ""
+msgstr "刪除電子郵件住址"
 
 #: templates/part.contact.php:70
 msgid "Enter phone number"
-msgstr ""
+msgstr "輸入電話號碼"
 
 #: templates/part.contact.php:74
 msgid "Delete phone number"
-msgstr ""
+msgstr "刪除電話號碼"
 
 #: templates/part.contact.php:84
 msgid "View on map"
@@ -390,19 +547,19 @@ msgstr ""
 
 #: templates/part.contact.php:84
 msgid "Edit address details"
-msgstr ""
+msgstr "電子郵件住址詳細資訊"
 
 #: templates/part.contact.php:95
 msgid "Add notes here."
-msgstr ""
+msgstr "在這裡新增註解"
 
 #: templates/part.contact.php:101
 msgid "Add field"
-msgstr ""
+msgstr "新增欄位"
 
 #: templates/part.contact.php:103
 msgid "Profile picture"
-msgstr ""
+msgstr "個人資料照片"
 
 #: templates/part.contact.php:107
 msgid "Phone"
@@ -410,7 +567,7 @@ msgstr "電話"
 
 #: templates/part.contact.php:110
 msgid "Note"
-msgstr ""
+msgstr "註解"
 
 #: templates/part.contactphoto.php:8
 msgid "Delete current photo"
@@ -428,6 +585,10 @@ msgstr ""
 msgid "Select photo from ownCloud"
 msgstr ""
 
+#: templates/part.cropphoto.php:64
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
 #: templates/part.edit_address_dialog.php:9
 msgid "Edit address"
 msgstr ""
@@ -497,31 +658,31 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "先生"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "先生"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "小姐"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "博士（醫生）"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "給定名（名）"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "額外名"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "家族名（姓）"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
@@ -584,7 +745,7 @@ msgid "Submit"
 msgstr "提出"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:28
+#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "取消"
 
@@ -612,27 +773,22 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Contacts imported successfully"
-msgstr ""
-
 #: templates/part.import.php:24
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.importaddressbook.php:9
-msgid "Import Addressbook"
+msgid "Close"
 msgstr ""
 
 #: templates/part.importaddressbook.php:12
+msgid ""
+"Currently this import function doesn't work while encryption is enabled.<br "
+"/>Please upload your VCF file with the file manager and click on it to "
+"import."
+msgstr ""
+
+#: templates/part.importaddressbook.php:16
 msgid "Select address book to import to:"
 msgstr ""
 
-#: templates/part.importaddressbook.php:20
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: templates/part.importaddressbook.php:21
+#: templates/part.importaddressbook.php:26
 msgid "Select from HD"
 msgstr ""
 
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 6a60cc71fe..5f3860d447 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 10:41+0000\n"
-"Last-Translator: Donahue Chuang <soshinwu@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:14+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,6 +30,82 @@ msgstr "無分類添加?"
 msgid "This category already exists: "
 msgstr "此分類已經存在:"
 
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:520
+msgid "January"
+msgstr ""
+
+#: js/js.js:520
+msgid "February"
+msgstr ""
+
+#: js/js.js:520
+msgid "March"
+msgstr ""
+
+#: js/js.js:520
+msgid "April"
+msgstr ""
+
+#: js/js.js:520
+msgid "May"
+msgstr ""
+
+#: js/js.js:520
+msgid "June"
+msgstr ""
+
+#: js/js.js:521
+msgid "July"
+msgstr ""
+
+#: js/js.js:521
+msgid "August"
+msgstr ""
+
+#: js/js.js:521
+msgid "September"
+msgstr ""
+
+#: js/js.js:521
+msgid "October"
+msgstr ""
+
+#: js/js.js:521
+msgid "November"
+msgstr ""
+
+#: js/js.js:521
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
 #: lostpassword/index.php:26
 msgid "Owncloud password reset"
 msgstr "私有雲重設密碼"
@@ -160,15 +236,15 @@ msgstr "資料庫主機"
 msgid "Finish setup"
 msgstr "完成設定"
 
-#: templates/layout.guest.php:36
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "網路服務已在你控制"
 
-#: templates/layout.user.php:35
+#: templates/layout.user.php:41
 msgid "Log out"
 msgstr "登出"
 
-#: templates/layout.user.php:47 templates/layout.user.php:48
+#: templates/layout.user.php:53 templates/layout.user.php:54
 msgid "Settings"
 msgstr "設定"
 
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 390457c114..4af073269d 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Donahue Chuang <soshinwu@gmail.com>, 2012.
+# Eddy Chang <taiwanmambo@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 10:37+0000\n"
-"Last-Translator: Donahue Chuang <soshinwu@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,13 +49,65 @@ msgstr "遺失暫存資料夾"
 msgid "Failed to write to disk"
 msgstr "寫入硬碟失敗"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "檔案"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "大小"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "修改"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "檔案處理"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -62,23 +115,23 @@ msgstr "最大上傳容量"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "最大允許: "
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "針對多檔案和目錄下載是必填的"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "啟用 Zip 下載"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0代表沒有限制"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "針對ZIP檔案最大輸入大小"
 
 #: templates/index.php:7
 msgid "New"
@@ -120,18 +173,6 @@ msgstr "分享"
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "大小"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "修改"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "全部刪除"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "刪除"
@@ -148,8 +189,8 @@ msgstr "你試圖上傳的檔案已超過伺服器的最大容量限制。　"
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "正在掃描檔案，請稍等。"
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "目前掃描"
diff --git a/l10n/zh_TW/gallery.po b/l10n/zh_TW/gallery.po
index b428d045e3..6f7fa99d1e 100644
--- a/l10n/zh_TW/gallery.po
+++ b/l10n/zh_TW/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 10:36+0000\n"
-"Last-Translator: Donahue Chuang <soshinwu@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,10 +18,50 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:37
 msgid "Pictures"
 msgstr "圖片"
 
+#: js/album_cover.js:44
+msgid "Share gallery"
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+msgid "Error: "
+msgstr ""
+
+#: js/album_cover.js:64 js/album_cover.js:100
+msgid "Internal error"
+msgstr ""
+
+#: js/album_cover.js:114
+msgid "Scanning root"
+msgstr ""
+
+#: js/album_cover.js:115
+msgid "Default order"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Ascending"
+msgstr ""
+
+#: js/album_cover.js:116
+msgid "Descending"
+msgstr ""
+
+#: js/album_cover.js:117 templates/index.php:19
+msgid "Settings"
+msgstr "設定"
+
+#: js/album_cover.js:122
+msgid "Scanning root cannot be empty"
+msgstr ""
+
+#: js/album_cover.js:122 js/album_cover.js:133
+msgid "Error"
+msgstr ""
+
 #: templates/index.php:16
 msgid "Rescan"
 msgstr "重新掃描"
@@ -34,10 +74,6 @@ msgstr "停止"
 msgid "Share"
 msgstr "分享"
 
-#: templates/index.php:19
-msgid "Settings"
-msgstr "設定"
-
 #: templates/view_album.php:19
 msgid "Back"
 msgstr "返回"
diff --git a/l10n/zh_TW/media.po b/l10n/zh_TW/media.po
index 90d3a07591..eb9a0eb114 100644
--- a/l10n/zh_TW/media.po
+++ b/l10n/zh_TW/media.po
@@ -7,10 +7,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-05-09 12:29+0200\n"
-"PO-Revision-Date: 2012-04-18 19:51+0000\n"
-"Last-Translator: Donahue Chuang <soshinwu@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,15 +18,19 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:32 templates/player.php:9
+#: appinfo/app.php:32 templates/player.php:8
 msgid "Music"
 msgstr "音樂"
 
-#: templates/music.php:3 templates/player.php:13
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
 msgid "Play"
 msgstr "播放"
 
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
 msgstr "暫停"
 
@@ -34,7 +38,7 @@ msgstr "暫停"
 msgid "Previous"
 msgstr "上一首"
 
-#: templates/music.php:6 templates/player.php:15
+#: templates/music.php:6 templates/player.php:14
 msgid "Next"
 msgstr "下一首"
 
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 8f19b70306..bcbaafd6e8 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-11 10:33+0000\n"
-"Last-Translator: Donahue Chuang <soshinwu@gmail.com>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,23 +19,38 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr "電子郵件已變更"
+msgid "Email saved"
+msgstr ""
 
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:19
-#: ajax/setlanguage.php:22
-msgid "Invalid request"
-msgstr "無效請求"
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
 msgstr "OpenID 已變更"
 
+#: ajax/openid.php:17 ajax/setlanguage.php:19 ajax/setlanguage.php:22
+msgid "Invalid request"
+msgstr "無效請求"
+
 #: ajax/setlanguage.php:17
 msgid "Language changed"
 msgstr "語言已變更"
 
-#: personal.php:39 personal.php:40
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__語言_名稱__"
 
@@ -56,10 +71,14 @@ msgid "Select an App"
 msgstr "選擇一個應用程式"
 
 #: templates/apps.php:25
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:26
 msgid "-licensed"
 msgstr "-已許可"
 
-#: templates/apps.php:25
+#: templates/apps.php:26
 msgid "by"
 msgstr "由"
 
diff --git a/lib/app.php b/lib/app.php
index 124b76cdc3..667633e264 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -35,6 +35,7 @@ class OC_App{
 	static private $personalForms = array();
 	static private $appInfo = array();
 	static private $appTypes = array();
+	static private $loadedApps = array();
 
 	/**
 	 * @brief loads all apps
@@ -48,24 +49,26 @@ class OC_App{
 	 * if $types is set, only apps of those types will be loaded
 	 */
 	public static function loadApps($types=null){
-		// Did we already load everything?
-		if( self::$init ){
-			return true;
-		}
-
 		// Load the enabled apps here
 		$apps = self::getEnabledApps();
 		// prevent app.php from printing output
 		ob_start();
 		foreach( $apps as $app ){
-			if((is_null($types) or self::isType($app,$types))){
+			if((is_null($types) or self::isType($app,$types)) && !in_array($app, self::$loadedApps)){
 				self::loadApp($app);
+				self::$loadedApps[] = $app;
 			}
 		}
 		ob_end_clean();
 
-		self::$init = true;
-
+		if (!defined('DEBUG') || !DEBUG){
+			if (is_null($types)) {
+				OC_Util::$core_scripts = OC_Util::$scripts;
+				OC_Util::$scripts = array();
+				OC_Util::$core_styles = OC_Util::$styles;
+				OC_Util::$styles = array();
+			}
+		}
 		// return
 		return true;
 	}
@@ -121,7 +124,7 @@ class OC_App{
 	 */
 	public static function setAppTypes($app){
 		$appData=self::getAppInfo($app);
-		
+
 		if(isset($appData['types'])){
 			$appTypes=implode(',',$appData['types']);
 		}else{
@@ -183,7 +186,7 @@ class OC_App{
 		if($app!==false){
 			// check if the app is compatible with this version of ownCloud
 			$info=OC_App::getAppInfo($app);
-			$version=OC_Util::getVersion();	
+			$version=OC_Util::getVersion();
 	                if(!isset($info['require']) or ($version[0]>$info['require'])){
 				OC_Log::write('core','App "'.$info['name'].'" can\'t be installed because it is not compatible with this version of ownCloud',OC_Log::ERROR);
 				return false;
@@ -487,13 +490,13 @@ class OC_App{
 				}
 			}
 		}
-		
+
 		// check if the current enabled apps are compatible with the current ownCloud version. disable them if not.
 		// this is important if you upgrade ownCloud and have non ported 3rd party apps installed
 		$apps =OC_App::getEnabledApps();
 		$version=OC_Util::getVersion();
 		foreach($apps as $app) {
-		
+
 			// check if the app is compatible with this version of ownCloud
 			$info=OC_App::getAppInfo($app);
 			if(!isset($info['require']) or ($version[0]>$info['require'])){
@@ -501,12 +504,12 @@ class OC_App{
 				OC_App::disable( $app );
 			}
 
-	
-			
+
+
 		}
-		
-		
-		
+
+
+
 	}
 
 	/**
diff --git a/lib/base.php b/lib/base.php
index e6fcb9ec4d..a439651f4a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -30,10 +30,6 @@ class OC{
 	 * Assoziative array for autoloading. classname => filename
 	 */
 	public static $CLASSPATH = array();
-	/**
-	 * $_SERVER['DOCUMENTROOT'] but without symlinks
-	 */
-	public static $DOCUMENTROOT = '';
 	/**
 	 * The installation path for owncloud on the server (e.g. /srv/http/owncloud)
 	 */
@@ -41,7 +37,7 @@ class OC{
 	/**
 	 * the current request path relative to the owncloud root (e.g. files/index.php)
 	 */
-	public static $SUBURI = '';
+	private static $SUBURI = '';
 	/**
 	 * the owncloud root path for http requests (e.g. owncloud/)
 	 */
@@ -50,10 +46,6 @@ class OC{
 	 * the folder that stores that data files for the filesystem of the user (e.g. /srv/http/owncloud/data/myusername/files)
 	 */
 	public static $CONFIG_DATADIRECTORY = '';
-	/**
-	 * the folder that stores the data for the root filesystem (e.g. /srv/http/owncloud/data)
-	 */
-	public static $CONFIG_DATADIRECTORY_ROOT = '';
 	/**
 	 * The installation path of the 3rdparty folder on the server (e.g. /srv/http/owncloud/3rdparty)
 	 */
@@ -130,7 +122,7 @@ class OC{
 
 	public static function initPaths(){
 		// calculate the documentroot
-		OC::$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']);
+		$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']);
 		OC::$SERVERROOT=str_replace("\\",'/',substr(__FILE__,0,-13));
 		OC::$SUBURI=substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen(OC::$SERVERROOT));
 		$scriptName=$_SERVER["SCRIPT_NAME"];
@@ -146,7 +138,7 @@ class OC{
 		}
                 OC::$WEBROOT=substr($scriptName,0,strlen($scriptName)-strlen(OC::$SUBURI));
 		// try a new way to detect the WEBROOT which is simpler and also works with the app directory outside the owncloud folder. let´s see if this works for everybody
-//		OC::$WEBROOT=substr(OC::$SERVERROOT,strlen(OC::$DOCUMENTROOT));
+//		OC::$WEBROOT=substr(OC::$SERVERROOT,strlen($DOCUMENTROOT));
 
 
 		if(OC::$WEBROOT!='' and OC::$WEBROOT[0]!=='/'){
@@ -291,18 +283,9 @@ class OC{
 	public static function loadfile(){
 		if(file_exists(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE)){
 			if(substr(OC::$REQUESTEDFILE, -3) == 'css'){
-				$appswebroot = (string) OC::$APPSWEBROOT;
-				$webroot = (string) OC::$WEBROOT;
-				$filepath = OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE;
-				header('Content-Type: text/css');
-				OC_Response::enableCaching();
-				OC_Response::setLastModifiedHeader(filemtime($filepath));
-				$cssfile = file_get_contents($filepath);
-				$cssfile = str_replace('%appswebroot%', $appswebroot, $cssfile);
-				$cssfile = str_replace('%webroot%', $webroot, $cssfile);
-				OC_Response::setETagHeader(md5($cssfile));
-				header('Content-Length: '.strlen($cssfile));
-				echo $cssfile;
+				$file = 'apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE;
+				$minimizer = new OC_Minimizer_CSS();
+				$minimizer->output(array(array(OC::$APPSROOT, OC::$APPSWEBROOT, $file)));
 				exit;
 			}elseif(substr(OC::$REQUESTEDFILE, -3) == 'php'){
 				require_once(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE);
@@ -381,16 +364,18 @@ class OC{
 
 		// CSRF protection
 		if(isset($_SERVER['HTTP_REFERER'])) $referer=$_SERVER['HTTP_REFERER']; else $referer='';
-		$protocol=OC_Helper::serverProtocol().'://'; 
+		$refererhost=parse_url($referer);
+		if(isset($refererhost['host'])) $refererhost=$refererhost['host']; else $refererhost='';
+		$server=OC_Helper::serverHost();
+		$serverhost=explode(':',$server);
+		$serverhost=$serverhost['0']; 
 		if(!self::$CLI){
-			$server=$protocol.OC_Helper::serverHost();
-			if(($_SERVER['REQUEST_METHOD']=='POST') and (substr($referer,0,strlen($server))<>$server)) {
-				$url = $protocol.OC_Helper::serverProtocol().OC::$WEBROOT.'/index.php';
+			if(($_SERVER['REQUEST_METHOD']=='POST') and ($refererhost<>$serverhost)) {
+				$url = OC_Helper::serverProtocol().'://'.$server.OC::$WEBROOT.'/index.php';
 				header("Location: $url");
 				exit();
 			}
 		}
-
 		self::initSession();
 		self::initTemplateEngine();
 		self::checkUpgrade();
@@ -440,7 +425,12 @@ class OC{
 
 		//make sure temporary files are cleaned up
 		register_shutdown_function(array('OC_Helper','cleanTmp'));
-		
+
+		if (!OC_AppConfig::getValue('core', 'remote_core.css', false)) {
+			OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
+			OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
+		}
+
 		//parse the given parameters
 		self::$REQUESTEDAPP = (isset($_GET['app'])?str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])):OC_Config::getValue('defaultapp', 'files'));
 		if(substr_count(self::$REQUESTEDAPP, '?') != 0){
diff --git a/lib/cache.php b/lib/cache.php
new file mode 100644
index 0000000000..70f11f3551
--- /dev/null
+++ b/lib/cache.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_Cache {
+	static protected $cache;
+
+	static protected function init() {
+		self::$cache = new OC_Cache_File();
+	}
+
+	static public function get($key) {
+		if (!self::$cache) {
+			self::init();
+		}
+		return self::$cache->get($key);
+	}
+
+	static public function set($key, $value, $ttl=0) {
+		if (empty($key)) {
+			return false;
+		}
+		if (!self::$cache) {
+			self::init();
+		}
+		return self::$cache->set($key, $value, $ttl);
+	}
+
+	static public function hasKey($key) {
+		if (!self::$cache) {
+			self::init();
+		}
+		return self::$cache->hasKey($key);
+	}
+
+	static public function remove($key) {
+		if (!self::$cache) {
+			self::init();
+		}
+		return self::$cache->remove($key);
+	}
+
+	static public function clear() {
+		if (!self::$cache) {
+			self::init();
+		}
+		return self::$cache->clear();
+	}
+
+}
diff --git a/lib/cache/apc.php b/lib/cache/apc.php
new file mode 100644
index 0000000000..f814afbe49
--- /dev/null
+++ b/lib/cache/apc.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_Cache_APC {
+	/**
+	 * entries in APC gets namespaced to prevent collisions between owncloud instances and users
+	 */
+	protected function getNameSpace() {
+		return OC_Util::getInstanceId().'/'.OC_User::getUser().'/';
+	}
+
+	public function get($key) {
+		$result = apc_fetch($this->getNamespace().$key, $success);
+		if (!$success) {
+			return null;
+		}
+		return $result;
+	}
+
+	public function set($key, $value, $ttl=0) {
+		return apc_store($this->getNamespace().$key, $value, $ttl);
+	}
+
+	public function hasKey($key) {
+		return apc_exists($this->getNamespace().$key);
+	}
+
+	public function remove($key) {
+		return apc_delete($this->getNamespace().$key);
+	}
+
+	public function clear(){
+		$ns = $this->getNamespace();
+		$cache = apc_cache_info('user');
+		foreach($cache['cache_list'] as $entry) {
+			if (strpos($entry['info'], $ns) === 0) {
+				apc_delete($entry['info']);
+			}
+		}
+	}
+}
diff --git a/lib/cache/file.php b/lib/cache/file.php
new file mode 100644
index 0000000000..0b7d3e3050
--- /dev/null
+++ b/lib/cache/file.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+
+class OC_Cache_File{
+	protected function getStorage() {
+		if(OC_User::isLoggedIn()){
+			$subdir = 'cache';
+			$view = new OC_FilesystemView('/'.OC_User::getUser());
+			if(!$view->file_exists($subdir)) {
+				$view->mkdir($subdir);
+			}
+			return new OC_FilesystemView('/'.OC_User::getUser().'/'.$subdir);
+		}else{
+			OC_Log::write('core','Can\'t get cache storage, user not logged in', OC_Log::ERROR);
+			return false;
+		}
+	}
+
+	public function get($key) {
+		if ($this->hasKey($key)) {
+			$storage = $this->getStorage();
+			return $storage->file_get_contents($key);
+		}
+		return null;
+	}
+
+	public function set($key, $value, $ttl=0) {
+		$storage = $this->getStorage();
+		if ($storage and $storage->file_put_contents($key, $value)) {
+			if ($ttl === 0) {
+				$ttl = 86400; // 60*60*24
+			}
+			return $storage->touch($key, time() + $ttl);
+		}
+		return false;
+	}
+
+	public function hasKey($key) {
+		$storage = $this->getStorage();
+		if ($storage && $storage->is_file($key)) {
+			$mtime = $storage->filemtime($key);
+			if ($mtime < time()) {
+				$storage->unlink($key);
+				return false;
+			}
+			return true;
+		}
+		return false;
+	}
+
+	public function remove($key) {
+		$storage = $this->getStorage();
+		if(!$storage){
+			return false;
+		}
+		return $storage->unlink($key);
+	}
+
+	public function clear(){
+		$storage = $this->getStorage();
+		if($storage and $storage->is_dir('/')){
+			$dh=$storage->opendir('/');
+			while($file=readdir($dh)){
+				if($file!='.' and $file!='..'){
+					$storage->unlink('/'.$file);
+				}
+			}
+		}
+	}
+}
diff --git a/lib/cache/xcache.php b/lib/cache/xcache.php
new file mode 100644
index 0000000000..b57338929e
--- /dev/null
+++ b/lib/cache/xcache.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_Cache_XCache {
+	/**
+	 * entries in XCache gets namespaced to prevent collisions between owncloud instances and users
+	 */
+	protected function getNameSpace() {
+		return OC_Util::getInstanceId().'/'.OC_User::getUser().'/';
+	}
+
+	public function get($key) {
+		return xcache_get($this->getNamespace().$key);
+	}
+
+	public function set($key, $value, $ttl=0) {
+		if($ttl>0){
+			return xcache_set($this->getNamespace().$key,$value,$ttl);
+		}else{
+			return xcache_set($this->getNamespace().$key,$value);
+		}
+	}
+
+	public function hasKey($key) {
+		return xcache_isset($this->getNamespace().$key);
+	}
+
+	public function remove($key) {
+		return xcache_unset($this->getNamespace().$key);
+	}
+
+	public function clear(){
+		return xcache_unset_by_prefix($this->getNamespace());
+	}
+}
diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index 935d3b0abe..e74d832cb0 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -118,8 +118,10 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	 */
 	public function delete() {
 
-		foreach($this->getChildren() as $child) $child->delete();
-		OC_Filesystem::rmdir($this->path);
+		if ($this->path != "/Shared") {
+			foreach($this->getChildren() as $child) $child->delete();
+			OC_Filesystem::rmdir($this->path);
+		}
 
 	}
 
diff --git a/lib/filecache.php b/lib/filecache.php
index a29e29928a..3fb8e4113c 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -169,6 +169,15 @@ class OC_FileCache{
 		$newParent=self::getParentId($newPath);
 		$query=OC_DB::prepare('UPDATE *PREFIX*fscache SET parent=? ,name=?, path=?, path_hash=? WHERE path_hash=?');
 		$query->execute(array($newParent,basename($newPath),$newPath,md5($newPath),md5($oldPath)));
+
+		$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE path LIKE ?');
+		$oldLength=strlen($oldPath);
+		$updateQuery=OC_DB::prepare('UPDATE *PREFIX*fscache SET path=?, path_hash=? WHERE path_hash=?');
+		while($row= $query->execute(array($oldPath.'/%'))->fetchRow()){
+			$old=$row['path'];
+			$new=$newPath.substr($old,$oldLength);
+			$updateQuery->execute(array($new,md5($new),md5($old)));
+		}
 	}
 
 	/**
diff --git a/lib/files.php b/lib/files.php
index 79d214665d..705b7a6ca6 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -170,7 +170,7 @@ class OC_Files {
 	* @param file $target
 	*/
 	public static function move($sourceDir,$source,$targetDir,$target){
-		if(OC_User::isLoggedIn()){
+		if(OC_User::isLoggedIn() && ($sourceDir != '' || $source != 'Shared')){
 			$targetFile=self::normalizePath($targetDir.'/'.$target);
 			$sourceFile=self::normalizePath($sourceDir.'/'.$source);
 			return OC_Filesystem::rename($sourceFile,$targetFile);
@@ -224,7 +224,7 @@ class OC_Files {
 	* @param file $name
 	*/
 	public static function delete($dir,$file){
-		if(OC_User::isLoggedIn()){
+		if(OC_User::isLoggedIn() && ($dir!= '' || $file != 'Shared')) {
 			$file=$dir.'/'.$file;
 			return OC_Filesystem::unlink($file);
 		}
@@ -373,10 +373,12 @@ class OC_Files {
 			}
 		}
 
-		//supress errors in case we don't have permissions for it
-		if(@file_put_contents(OC::$SERVERROOT.'/.htaccess', $htaccess)) {
-			return OC_Helper::computerFileSize($size);
-		}
+		//check for write permissions
+		if(is_writable(OC::$SERVERROOT.'/.htaccess')) {
+			file_put_contents(OC::$SERVERROOT.'/.htaccess', $htaccess);
+			return OC_Helper::computerFileSize($size);	
+		} else { OC_Log::write('files','Can\'t write upload limit to '.OC::$SERVERROOT.'/.htaccess. Please check the file permissions',OC_Log::WARN); }
+		
 		return false;
 	}
 
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 6b3c254c5e..84d45f5f24 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -290,8 +290,10 @@ class OC_Filesystem{
 	}
 
 	/**
-	 * get the fake root
+	 * @brief get the relative path of the root data directory for the current user
 	 * @return string
+	 *
+	 * Returns path like /admin/files
 	 */
 	static public function getRoot(){
 		return self::$defaultInstance->getRoot();
diff --git a/lib/group.php b/lib/group.php
index 7967e1a581..ceee5fa4ed 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -84,7 +84,7 @@ class OC_Group {
 		OC_Hook::emit( "OC_Group", "pre_createGroup", array( "run" => &$run, "gid" => $gid ));
 
 		if($run){
-			//create the user in the first backend that supports creating users
+			//create the group in the first backend that supports creating groups
 			foreach(self::$_usedBackends as $backend){
 				if(!$backend->implementsActions(OC_GROUP_BACKEND_CREATE_GROUP))
 					continue;
@@ -141,9 +141,6 @@ class OC_Group {
 	 */
 	public static function inGroup( $uid, $gid ){
 		foreach(self::$_usedBackends as $backend){
-			if(!$backend->implementsActions(OC_GROUP_BACKEND_IN_GROUP))
-				continue;
-
 			if($backend->inGroup($uid,$gid)){
 				return true;
 			}
@@ -228,9 +225,6 @@ class OC_Group {
 	public static function getUserGroups( $uid ){
 		$groups=array();
 		foreach(self::$_usedBackends as $backend){
-			if(!$backend->implementsActions(OC_GROUP_BACKEND_GET_USER_GROUPS))
-				continue;
-
 			$groups=array_merge($backend->getUserGroups($uid),$groups);
 		}
 		asort($groups);
@@ -246,9 +240,6 @@ class OC_Group {
 	public static function getGroups(){
 		$groups=array();
 		foreach(self::$_usedBackends as $backend){
-			if(!$backend->implementsActions(OC_GROUP_BACKEND_GET_GROUPS))
-				continue;
-
 			$groups=array_merge($backend->getGroups(),$groups);
 		}
 		asort($groups);
@@ -276,9 +267,6 @@ class OC_Group {
 	public static function usersInGroup($gid){
 		$users=array();
 		foreach(self::$_usedBackends as $backend){
-			if(!$backend->implementsActions(OC_GROUP_BACKEND_GET_USERS))
-				continue;
-
 			$users=array_merge($backend->usersInGroup($gid),$users);
 		}
 		return $users;
diff --git a/lib/group/backend.php b/lib/group/backend.php
index 3b65259946..24778afd1e 100644
--- a/lib/group/backend.php
+++ b/lib/group/backend.php
@@ -31,12 +31,8 @@ define('OC_GROUP_BACKEND_NOT_IMPLEMENTED',   -501);
  */
 define('OC_GROUP_BACKEND_CREATE_GROUP',      0x00000001);
 define('OC_GROUP_BACKEND_DELETE_GROUP',      0x00000010);
-define('OC_GROUP_BACKEND_IN_GROUP',          0x00000100);
-define('OC_GROUP_BACKEND_ADD_TO_GROUP',      0x00001000);
-define('OC_GROUP_BACKEND_REMOVE_FROM_GOUP',  0x00010000);
-define('OC_GROUP_BACKEND_GET_USER_GROUPS',   0x00100000);
-define('OC_GROUP_BACKEND_GET_USERS',         0x01000000);
-define('OC_GROUP_BACKEND_GET_GROUPS',        0x10000000);
+define('OC_GROUP_BACKEND_ADD_TO_GROUP',      0x00000100);
+define('OC_GROUP_BACKEND_REMOVE_FROM_GOUP',  0x00001000);
 
 /**
  * Abstract base class for user management
@@ -45,14 +41,10 @@ abstract class OC_Group_Backend {
 	protected $possibleActions = array(
 		OC_GROUP_BACKEND_CREATE_GROUP => 'createGroup',
 		OC_GROUP_BACKEND_DELETE_GROUP => 'deleteGroup',
-		OC_GROUP_BACKEND_IN_GROUP => 'inGroup',
 		OC_GROUP_BACKEND_ADD_TO_GROUP => 'addToGroup',
 		OC_GROUP_BACKEND_REMOVE_FROM_GOUP => 'removeFromGroup',
-		OC_GROUP_BACKEND_GET_USER_GROUPS => 'getUserGroups',
-		OC_GROUP_BACKEND_GET_USERS => 'usersInGroup',
-		OC_GROUP_BACKEND_GET_GROUPS => 'getGroups'
 	);
-	
+
 	/**
 	* @brief Get all supported actions
 	* @returns bitwise-or'ed actions
@@ -70,7 +62,7 @@ abstract class OC_Group_Backend {
 
 		return $actions;
 	}
-	
+
 	/**
 	* @brief Check if backend implements actions
 	* @param $actions bitwise-or'ed actions
@@ -83,15 +75,55 @@ abstract class OC_Group_Backend {
 		return (bool)($this->getSupportedActions() & $actions);
 	}
 
+	/**
+	 * @brief is user in group?
+	 * @param $uid uid of the user
+	 * @param $gid gid of the group
+	 * @returns true/false
+	 *
+	 * Checks whether the user is member of a group or not.
+	 */
+	public function inGroup($uid, $gid){
+		return in_array($gid, $this->getUserGroups($uid));
+	}
+
+	/**
+	 * @brief Get all groups a user belongs to
+	 * @param $uid Name of the user
+	 * @returns array with group names
+	 *
+	 * This function fetches all groups a user belongs to. It does not check
+	 * if the user exists at all.
+	 */
+	public function getUserGroups($uid){
+		return array();
+	}
+
+	/**
+	 * @brief get a list of all groups
+	 * @returns array with group names
+	 *
+	 * Returns a list with all groups
+	 */
+	public function getGroups(){
+		return array();
+	}
+
 	/**
 	 * check if a group exists
 	 * @param string $gid
 	 * @return bool
 	 */
 	public function groupExists($gid){
-		if(!$this->implementsActions(OC_GROUP_BACKEND_GET_GROUPS)){
-			return false;
-		}
 		return in_array($gid, $this->getGroups());
 	}
+
+	/**
+	 * @brief get a list of all users in a group
+	 * @returns array with user ids
+	 */
+	public function usersInGroup($gid){
+		return array();
+	}
+
 }
diff --git a/lib/group/database.php b/lib/group/database.php
index af55de1f42..fb173665eb 100644
--- a/lib/group/database.php
+++ b/lib/group/database.php
@@ -41,7 +41,7 @@
  * Class for group management in a SQL Database (e.g. MySQL, SQLite)
  */
 class OC_Group_Database extends OC_Group_Backend {
-	static private $userGroupCache=array();
+	private $userGroupCache=array();
 
 	/**
 	 * @brief Try to create a new group
@@ -51,7 +51,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 * Trys to create a new group. If the group name already exists, false will
 	 * be returned.
 	 */
-	public static function createGroup( $gid ){
+	public function createGroup( $gid ){
 		// Check for existence
 		$query = OC_DB::prepare( "SELECT gid FROM `*PREFIX*groups` WHERE gid = ?" );
 		$result = $query->execute( array( $gid ));
@@ -76,7 +76,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 *
 	 * Deletes a group and removes it from the group_user-table
 	 */
-	public static function deleteGroup( $gid ){
+	public function deleteGroup( $gid ){
 		// Delete the group
 		$query = OC_DB::prepare( "DELETE FROM `*PREFIX*groups` WHERE gid = ?" );
 		$result = $query->execute( array( $gid ));
@@ -96,7 +96,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 *
 	 * Checks whether the user is member of a group or not.
 	 */
-	public static function inGroup( $uid, $gid ){
+	public function inGroup( $uid, $gid ){
 		// check
 		$query = OC_DB::prepare( "SELECT uid FROM `*PREFIX*group_user` WHERE gid = ? AND uid = ?" );
 		$result = $query->execute( array( $gid, $uid ));
@@ -112,9 +112,9 @@ class OC_Group_Database extends OC_Group_Backend {
 	 *
 	 * Adds a user to a group.
 	 */
-	public static function addToGroup( $uid, $gid ){
+	public function addToGroup( $uid, $gid ){
 		// No duplicate entries!
-		if( !self::inGroup( $uid, $gid )){
+		if( !$this->inGroup( $uid, $gid )){
 			$query = OC_DB::prepare( "INSERT INTO `*PREFIX*group_user` ( `uid`, `gid` ) VALUES( ?, ? )" );
 			$result = $query->execute( array( $uid, $gid ));
 			return true;
@@ -131,7 +131,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 *
 	 * removes the user from a group.
 	 */
-	public static function removeFromGroup( $uid, $gid ){
+	public function removeFromGroup( $uid, $gid ){
 		$query = OC_DB::prepare( "DELETE FROM *PREFIX*group_user WHERE uid = ? AND gid = ?" );
 		$result = $query->execute( array( $uid, $gid ));
 
@@ -146,7 +146,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 * This function fetches all groups a user belongs to. It does not check
 	 * if the user exists at all.
 	 */
-	public static function getUserGroups( $uid ){
+	public function getUserGroups( $uid ){
 		// No magic!
 		$query = OC_DB::prepare( "SELECT gid FROM `*PREFIX*group_user` WHERE uid = ?" );
 		$result = $query->execute( array( $uid ));
@@ -165,7 +165,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 *
 	 * Returns a list with all groups
 	 */
-	public static function getGroups(){
+	public function getGroups(){
 		$query = OC_DB::prepare( "SELECT gid FROM `*PREFIX*groups`" );
 		$result = $query->execute();
 
@@ -176,12 +176,12 @@ class OC_Group_Database extends OC_Group_Backend {
 
 		return $groups;
 	}
-	
+
 	/**
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
 	 */
-	public static function usersInGroup($gid){
+	public function usersInGroup($gid){
 		$query=OC_DB::prepare('SELECT uid FROM *PREFIX*group_user WHERE gid=?');
 		$users=array();
 		$result=$query->execute(array($gid));
diff --git a/lib/group/example.php b/lib/group/example.php
index b2de119553..c18562db7a 100644
--- a/lib/group/example.php
+++ b/lib/group/example.php
@@ -93,6 +93,13 @@ abstract class OC_Group_Example {
 	 */
 	public static function getGroups(){}
 
+	/**
+	 * check if a group exists
+	 * @param string $gid
+	 * @return bool
+	 */
+	public function groupExists($gid){}
+
 	/**
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
diff --git a/lib/helper.php b/lib/helper.php
index f8f84b91ae..decc1d6133 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -120,7 +120,7 @@ class OC_Helper {
 	 */
 	public static function linkToAbsolute( $app, $file ) {
 		$urlLinkTo = self::linkTo( $app, $file );
-		$urlLinkTo = OC_Helper::serverProtocol(). '://'  . self::serverHost() . $urlLinkTo;
+		$urlLinkTo = self::serverProtocol(). '://'  . self::serverHost() . $urlLinkTo;
 		return $urlLinkTo;
 	}
 
@@ -131,8 +131,8 @@ class OC_Helper {
 	 *
 	 * Returns a absolute url to the given service.
 	 */
-	public static function linkToRemote( $service ) {
-		return self::linkToAbsolute( '', 'remote.php') . '/' . $service . '/';
+	public static function linkToRemote( $service, $add_slash = true ) {
+		return self::linkToAbsolute( '', 'remote.php') . '/' . $service . ($add_slash?'/':'');
 	}
 
 	/**
diff --git a/lib/image.php b/lib/image.php
index 4c53dc32f5..a6bb92cea2 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -187,15 +187,22 @@ class OC_Image {
 	}
 
 	/**
-	* @returns Returns a base64 encoded string suitable for embedding in a VCard.
+	* @returns Returns the raw image data.
 	*/
-	function __toString() {
+	function data() {
 		ob_start();
 		$res = imagepng($this->resource);
 		if (!$res) {
-			OC_Log::write('core','OC_Image->__toString. Error writing image',OC_Log::ERROR);
+			OC_Log::write('core','OC_Image->data. Error getting image data.',OC_Log::ERROR);
 		}
-		return base64_encode(ob_get_clean());
+		return ob_get_clean();
+	}
+
+	/**
+	* @returns Returns a base64 encoded string suitable for embedding in a VCard.
+	*/
+	function __toString() {
+		return base64_encode($this->data());
 	}
 
 	/**
diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php
index 5913d8b5b8..92914af8fc 100644
--- a/lib/log/owncloud.php
+++ b/lib/log/owncloud.php
@@ -63,7 +63,7 @@ class OC_Log_Owncloud {
 		self::init();
 		$minLevel=OC_Config::getValue( "loglevel", OC_Log::WARN );
 		$entries = array();
-		$handle = fopen(self::$logFile, 'r');
+		$handle = @fopen(self::$logFile, 'r');
 		if ($handle) {
 			// Just a guess to set the file pointer to the right spot
 			$maxLineLength = 150;
diff --git a/lib/minimizer.php b/lib/minimizer.php
new file mode 100644
index 0000000000..9f9ef086c4
--- /dev/null
+++ b/lib/minimizer.php
@@ -0,0 +1,40 @@
+<?php
+
+abstract class OC_Minimizer
+{
+	protected $files = array();
+
+	protected function appendIfExist($root, $webroot, $file) {
+                if (is_file($root.'/'.$file)) {
+			$this->files[] = array($root, $webroot, $file);
+                        return true;
+                }
+                return false;
+	}
+
+	public function getLastModified($files) {
+		$last_modified = 0;
+		foreach($files as $file_info) {
+			$file = $file_info[0] . '/' . $file_info[2];
+			$filemtime = filemtime($file);
+			if ($filemtime > $last_modified) {
+				$last_modified = $filemtime;
+			}
+		}
+		return $last_modified;
+	}
+
+	abstract public function minimizeFiles($files);
+
+	public function output($files) {
+		header('Content-Type: '.$this->contentType);
+		OC_Response::enableCaching();
+		$last_modified = $this->getLastModified($files);
+		OC_Response::setLastModifiedHeader($last_modified);
+
+		$out = $this->minimizeFiles($files);
+		OC_Response::setETagHeader(md5($out));
+		header('Content-Length: '.strlen($out));
+		echo $out;
+	}
+}
diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php
new file mode 100644
index 0000000000..4637417579
--- /dev/null
+++ b/lib/minimizer/css.php
@@ -0,0 +1,73 @@
+<?php
+
+require_once('mediawiki/CSSMin.php');
+
+class OC_Minimizer_CSS extends OC_Minimizer
+{
+	protected $contentType = 'text/css';
+
+	public function findFiles($styles) {
+		// Read the selected theme from the config file
+		$theme=OC_Config::getValue( "theme" );
+
+		// Read the detected formfactor and use the right file name.
+		$fext = OC_Template::getFormFactorExtension();
+		foreach($styles as $style){
+			// is it in 3rdparty?
+			if($this->appendIfExist(OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
+
+			// or in apps?
+			}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style$fext.css" )) {
+			}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style.css" )) {
+
+			// or in the owncloud root?
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$style$fext.css" )) {
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$style.css" )) {
+
+			// or in core ?
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$style$fext.css" )) {
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) {
+
+			}else{
+				echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
+				die();
+			}
+		}
+		// Add the theme css files. you can override the default values here
+		if(!empty($theme)) {
+			foreach($styles as $style){
+				     if($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style$fext.css" )) {
+				}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style.css" )) {
+
+				}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style$fext.css" )) {
+				}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style.css" )) {
+
+				}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style$fext.css" )) {
+				}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style.css" )) {
+				}
+			}
+		}
+		return $this->files;
+	}
+
+	public function minimizeFiles($files) {
+		$css_out = '';
+		$appswebroot = (string) OC::$APPSWEBROOT;
+		$webroot = (string) OC::$WEBROOT;
+		foreach($files as $file_info) {
+			$file = $file_info[0] . '/' . $file_info[2];
+			$css_out .= '/* ' . $file . ' */' . "\n";
+			$css = file_get_contents($file);
+			if (strpos($file, OC::$APPSROOT) == 0) {
+				$css = str_replace('%appswebroot%', $appswebroot, $css);
+				$css = str_replace('%webroot%', $webroot, $css);
+			}
+			$remote = $file_info[1];
+			$remote .= '/';
+			$remote .= dirname($file_info[2]);
+			$css_out .= CSSMin::remap($css, dirname($file), $remote, true);
+		}
+		$css_out = CSSMin::minify($css_out);
+		return $css_out;
+	}
+}
diff --git a/lib/minimizer/js.php b/lib/minimizer/js.php
new file mode 100644
index 0000000000..4ddaa79d81
--- /dev/null
+++ b/lib/minimizer/js.php
@@ -0,0 +1,62 @@
+<?php
+
+require_once('mediawiki/JavaScriptMinifier.php');
+
+class OC_Minimizer_JS extends OC_Minimizer
+{
+	protected $contentType = 'application/javascript';
+
+	public function findFiles($scripts) {
+		// Read the selected theme from the config file
+		$theme=OC_Config::getValue( "theme" );
+
+		// Read the detected formfactor and use the right file name.
+		$fext = OC_Template::getFormFactorExtension();
+		// Add the core js files or the js files provided by the selected theme
+		foreach($scripts as $script){
+			// Is it in 3rd party?
+			if($this->appendIfExist(OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $script.'.js')) {
+
+			// Is it in apps and overwritten by the theme?
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script$fext.js" )) {
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script.js" )) {
+
+			// Is it part of an app?
+			}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script$fext.js" )) {
+			}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script.js" )) {
+
+			// Is it in the owncloud root but overwritten by the theme?
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script$fext.js" )) {
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script.js" )) {
+
+			// Is it in the owncloud root ?
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$script$fext.js" )) {
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$script.js" )) {
+
+			// Is in core but overwritten by a theme?
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script$fext.js" )) {
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script.js" )) {
+
+			// Is it in core?
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$script$fext.js" )) {
+			}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$script.js" )) {
+
+			}else{
+				echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
+				die();
+			}
+		}
+		return $this->files;
+	}
+
+	public function minimizeFiles($files) {
+		$js_out = '';
+		foreach($files as $file_info) {
+			$file = $file_info[0] . '/' . $file_info[2];
+			$js_out .= '/* ' . $file . ' */' . "\n";
+			$js_out .= file_get_contents($file);
+		}
+		$js_out = JavaScriptMinifier::minify($js_out);
+		return $js_out;
+	}
+}
diff --git a/lib/public/app.php b/lib/public/app.php
index 1f84087f07..9e2108818b 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -36,7 +36,8 @@ namespace OCP;
 class App {
 
         /**
-         * @brief makes owncloud aware of this app
+         * @brief Makes owncloud aware of this app
+         * @brief This call is deprecated and not necessary to use.
          * @param $data array with all information
          * @returns true/false
          *
diff --git a/lib/template.php b/lib/template.php
index a15cfcc457..14833a1e5b 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -166,7 +166,7 @@ class OC_Template{
 	/**
 	 * @brief Returns the formfactor extension for current formfactor
 	 */
-	protected function getFormFactorExtension()
+	static public function getFormFactorExtension()
 	{
 		$formfactor=$_SESSION['formfactor'];
 		if($formfactor=='default') { 
@@ -196,7 +196,7 @@ class OC_Template{
 		$theme=OC_Config::getValue( "theme" );
 
 		// Read the detected formfactor and use the right file name.
-		$fext = $this->getFormFactorExtension();
+		$fext = self::getFormFactorExtension();
 
 		$app = $this->application;
 		// Check if it is a app template or not.
@@ -379,8 +379,9 @@ class OC_Template{
 			$theme=OC_Config::getValue( "theme" );
 
 			// Read the detected formfactor and use the right file name.
-			$fext = $this->getFormFactorExtension();
+			$fext = self::getFormFactorExtension();
 
+			$page->assign('jsfiles', array());
 			// Add the core js files or the js files provided by the selected theme
 			foreach(OC_Util::$scripts as $script){
 				// Is it in 3rd party?
@@ -417,6 +418,7 @@ class OC_Template{
 				}
 			}
 			// Add the css files
+			$page->assign('cssfiles', array());
 			foreach(OC_Util::$styles as $style){
 				// is it in 3rdparty?
                                 if($page->appendIfExist('cssfiles', OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
@@ -434,7 +436,7 @@ class OC_Template{
 				}elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) {
 
 				}else{
-					echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
+					echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
 					die();
 				}
 			}
diff --git a/lib/user.php b/lib/user.php
index 17c11322b8..f1903093d6 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -129,7 +129,7 @@ class OC_User {
 		if(trim($password) == ''){
 			throw new Exception('A valid password must be provided');
 		}
-		
+
 		// Check if user already exists
 		if( self::userExists($uid) ){
 			throw new Exception('The username is already being used');
@@ -168,9 +168,7 @@ class OC_User {
 		if( $run ){
 			//delete the user from all backends
 			foreach(self::$_usedBackends as $backend){
-				if($backend->implementsActions(OC_USER_BACKEND_DELETE_USER)){
-					$backend->deleteUser($uid);
-				}
+				$backend->deleteUser($uid);
 			}
 			// We have to delete the user from all groups
 			foreach( OC_Group::getUserGroups( $uid ) as $i ){
@@ -242,12 +240,13 @@ class OC_User {
 	 * Checks if the user is logged in
 	 */
 	public static function isLoggedIn(){
-		if( isset($_SESSION['user_id']) AND $_SESSION['user_id'] AND self::userExists($_SESSION['user_id']) ){
-			return true;
-		}
-		else{
-			return false;
+		if( isset($_SESSION['user_id']) AND $_SESSION['user_id']) {
+			OC_App::loadApps(array('authentication'));
+			if (self::userExists($_SESSION['user_id']) ){
+				return true;
+			}
 		}
+		return false;
 	}
 
 	/**
@@ -331,11 +330,9 @@ class OC_User {
 	public static function getUsers(){
 		$users=array();
 		foreach(self::$_usedBackends as $backend){
-			if($backend->implementsActions(OC_USER_BACKEND_GET_USERS)){
-				$backendUsers=$backend->getUsers();
-				if(is_array($backendUsers)){
-					$users=array_merge($users,$backendUsers);
-				}
+			$backendUsers=$backend->getUsers();
+			if(is_array($backendUsers)){
+				$users=array_merge($users,$backendUsers);
 			}
 		}
 		asort($users);
@@ -349,11 +346,9 @@ class OC_User {
 	 */
 	public static function userExists($uid){
 		foreach(self::$_usedBackends as $backend){
-			if($backend->implementsActions(OC_USER_BACKEND_USER_EXISTS)){
-				$result=$backend->userExists($uid);
-				if($result===true){
-					return true;
-				}
+			$result=$backend->userExists($uid);
+			if($result===true){
+				return true;
 			}
 		}
 		return false;
diff --git a/lib/user/backend.php b/lib/user/backend.php
index c31d4b5785..be068a63ce 100644
--- a/lib/user/backend.php
+++ b/lib/user/backend.php
@@ -32,11 +32,8 @@ define('OC_USER_BACKEND_NOT_IMPLEMENTED',   -501);
  * actions that user backends can define
  */
 define('OC_USER_BACKEND_CREATE_USER',       0x000001);
-define('OC_USER_BACKEND_DELETE_USER',       0x000010);
-define('OC_USER_BACKEND_SET_PASSWORD',      0x000100);
-define('OC_USER_BACKEND_CHECK_PASSWORD',    0x001000);
-define('OC_USER_BACKEND_GET_USERS',         0x010000);
-define('OC_USER_BACKEND_USER_EXISTS',       0x100000);
+define('OC_USER_BACKEND_SET_PASSWORD',      0x000010);
+define('OC_USER_BACKEND_CHECK_PASSWORD',    0x000100);
 
 
 /**
@@ -49,11 +46,8 @@ abstract class OC_User_Backend {
 
 	protected $possibleActions = array(
 		OC_USER_BACKEND_CREATE_USER => 'createUser',
-		OC_USER_BACKEND_DELETE_USER => 'deleteUser',
 		OC_USER_BACKEND_SET_PASSWORD => 'setPassword',
 		OC_USER_BACKEND_CHECK_PASSWORD => 'checkPassword',
-		OC_USER_BACKEND_GET_USERS => 'getUsers',
-		OC_USER_BACKEND_USER_EXISTS => 'userExists'
 	);
 
 	/**
@@ -85,4 +79,34 @@ abstract class OC_User_Backend {
 	public function implementsActions($actions){
 		return (bool)($this->getSupportedActions() & $actions);
 	}
+
+	/**
+	* @brief delete a user
+	* @param $uid The username of the user to delete
+	* @returns true/false
+	*
+	* Deletes a user
+	*/
+	public function deleteUser( $uid ){
+		return false;
+	}
+
+	/**
+	* @brief Get a list of all users
+	* @returns array with all uids
+	*
+	* Get a list of all users.
+	*/
+	public function getUsers(){
+		return array();
+	}
+
+	/**
+	* @brief check if a user exists
+	* @param string $uid the username
+	* @return boolean
+	*/
+	public function userExists($uid){
+		return false;
+	}
 }
diff --git a/lib/user/example.php b/lib/user/example.php
index 18bc6bce00..7f3fd1b857 100644
--- a/lib/user/example.php
+++ b/lib/user/example.php
@@ -39,17 +39,6 @@ abstract class OC_User_Example extends OC_User_Backend {
 		return OC_USER_BACKEND_NOT_IMPLEMENTED;
 	}
 
-	/**
-		* @brief delete a user
-		* @param $uid The username of the user to delete
-		* @returns true/false
-		*
-		* Deletes a user
-		*/
-	public function deleteUser( $uid ){
-		return OC_USER_BACKEND_NOT_IMPLEMENTED;
-	}
-
 	/**
 		* @brief Set password
 		* @param $uid The username
@@ -74,23 +63,4 @@ abstract class OC_User_Example extends OC_User_Backend {
 	public function checkPassword($uid, $password){
 		return OC_USER_BACKEND_NOT_IMPLEMENTED;
 	}
-
-	/**
-		* @brief Get a list of all users
-		* @returns array with all uids
-		*
-		* Get a list of all users.
-		*/
-	public function getUsers(){
-		return OC_USER_BACKEND_NOT_IMPLEMENTED;
-	}
-
-	/**
-		* @brief check if a user exists
-		* @param string $uid the username
-		* @return boolean
-		*/
-	public function userExists($uid){
-		return OC_USER_BACKEND_NOT_IMPLEMENTED;
-	}
 }
diff --git a/lib/util.php b/lib/util.php
index fda60587b8..20888fa71f 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -10,6 +10,8 @@ class OC_Util {
 	public static $headers=array();
 	private static $rootMounted=false;
 	private static $fsSetup=false;
+	public static $core_styles=array();
+	public static $core_scripts=array();
 
 	// Can be set up
 	public static function setupFS( $user = "", $root = "files" ){// configure the initial filesystem based on the configuration
@@ -29,7 +31,7 @@ class OC_Util {
 		}
 		
 		// Check if apps folder is writable.
-		if(!is_writable(OC::$SERVERROOT."/apps/")) {
+		if(OC_Config::getValue('writable_appsdir', true) && !is_writable(OC::$SERVERROOT."/apps/")) {
 			$tmpl = new OC_Template( '', 'error', 'guest' );
 			$tmpl->assign('errors',array(1=>array('error'=>"Can't write into apps directory 'apps'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
 			$tmpl->printPage();
@@ -39,7 +41,7 @@ class OC_Util {
 		// Create root dir.
 		if(!is_dir($CONFIG_DATADIRECTORY_ROOT)){
 			$success=@mkdir($CONFIG_DATADIRECTORY_ROOT);
-            if(!$success) {
+			if(!$success) {
 				$tmpl = new OC_Template( '', 'error', 'guest' );
 				$tmpl->assign('errors',array(1=>array('error'=>"Can't create data directory (".$CONFIG_DATADIRECTORY_ROOT.")",'hint'=>"You can usually fix this by giving the webserver write access to the ownCloud directory '".OC::$SERVERROOT."' (in a terminal, use the command 'chown -R www-data:www-data /path/to/your/owncloud/install/data' ")));
 				$tmpl->printPage();
@@ -58,7 +60,6 @@ class OC_Util {
 			self::$rootMounted=true;
 		}
 		if( $user != "" ){ //if we aren't logged in, there is no use to set up the filesystem
-
 			OC::$CONFIG_DATADIRECTORY = $CONFIG_DATADIRECTORY_ROOT."/$user/$root";
 			if( !is_dir( OC::$CONFIG_DATADIRECTORY )){
 				mkdir( OC::$CONFIG_DATADIRECTORY, 0755, true );
@@ -329,4 +330,17 @@ class OC_Util {
 		}
 		exit();
 	}
+
+	/**
+	 * get an id unqiue for this instance
+	 * @return string
+	 */
+	public static function getInstanceId(){
+		$id=OC_Config::getValue('instanceid',null);
+		if(is_null($id)){
+			$id=uniqid();
+			OC_Config::setValue('instanceid',$id);
+		}
+		return $id;
+	}
 }
diff --git a/remote.php b/remote.php
index 44b85f762f..7131dfc940 100644
--- a/remote.php
+++ b/remote.php
@@ -11,7 +11,7 @@ if (!$pos = strpos($path_info, '/', 1)) {
 	$pos = strlen($path_info);
 }
 $service=substr($path_info, 1, $pos-1);
-$file = OCP\CONFIG::getAppValue('core', 'remote_' . $service);
+$file = OC_AppConfig::getValue('core', 'remote_' . $service);
 if(is_null($file)){
 	header('HTTP/1.0 404 Not Found');
 	exit;
diff --git a/settings/ajax/lostpassword.php b/settings/ajax/lostpassword.php
index 5874dec964..c6df8551f5 100644
--- a/settings/ajax/lostpassword.php
+++ b/settings/ajax/lostpassword.php
@@ -8,12 +8,12 @@ OC_JSON::checkLoggedIn();
 $l=OC_L10N::get('core');
 
 // Get data
-if( isset( $_POST['email'] ) ){
+if( isset( $_POST['email'] ) && filter_var( $_POST['email'], FILTER_VALIDATE_EMAIL) ){
 	$email=trim($_POST['email']);
 	OC_Preferences::setValue(OC_User::getUser(),'settings','email',$email);
-	OC_JSON::success(array("data" => array( "message" => $l->t("email Changed") )));
+	OC_JSON::success(array("data" => array( "message" => $l->t("Email saved") )));
 }else{
-	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
+	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid email") )));
 }
 
 ?>
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 36d9b8d26f..b5a3c0f03b 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -34,7 +34,7 @@ li.selected { background-color:#ddd; }
 #content>table:not(.nostyle) { margin-top:3em; }
 table:not(.nostyle) { width:100%; }
 #rightcontent { padding-left: 1em; }
-td.quota { position:relative }
+td.quota { position:absolute; }
 div.quota { float:right; display:block; position:absolute; right:25em; top:0; }
 select.quota { position:absolute; left:0; top:0; width:10em; }
 input.quota-other { display:none; position:absolute; left:0.1em; top:0.1em; width:7em; border:none; -webkit-box-shadow: none -mox-box-shadow:none ; box-shadow:none; }
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 5ac7d80b94..224076aba4 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -34,6 +34,8 @@ $(document).ready(function(){
 		if ( app.internal == false ) {
 			$('#rightcontent p.appslink').show();
 			$('#rightcontent a').attr('href','http://apps.owncloud.com/content/show.php?content='+app.id);
+		} else {
+			$('#rightcontent p.appslink').hide();
 		}
 		return false;
 	});
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 2161e15787..ff711e7ccc 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "تم تغير العنوان البريدي",
-"Invalid request" => "طلبك غير مفهوم",
 "OpenID Changed" => "تم تغيير ال OpenID",
+"Invalid request" => "طلبك غير مفهوم",
 "Language changed" => "تم تغيير اللغة",
 "__language_name__" => "__language_name__",
 "Select an App" => "إختر تطبيقاً",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 9774883930..6e0c6e2fee 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Invalid request" => "Невалидна заявка",
 "OpenID Changed" => "OpenID е сменено",
+"Invalid request" => "Невалидна заявка",
 "Language changed" => "Езика е сменен",
 "Select an App" => "Изберете програма",
 "-licensed" => "-лицензирано",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 89558041ae..56e67c1a13 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "el correu electrònic ha canviat",
-"Invalid request" => "Sol.licitud no vàlida",
 "OpenID Changed" => "OpenID ha canviat",
+"Invalid request" => "Sol.licitud no vàlida",
 "Language changed" => "S'ha canviat l'idioma",
 "__language_name__" => "Català",
 "Log" => "Registre",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 9beb4215e0..bef172a9f5 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "email změněn",
-"Invalid request" => "Chybný dotaz",
 "OpenID Changed" => "OpenID změněn",
+"Invalid request" => "Chybný dotaz",
 "Language changed" => "Jazyk byl změněn",
 "__language_name__" => "Česky",
 "Log" => "Log",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index a50aacd4cc..4cd7abfc90 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,18 +1,24 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "email ændret",
-"Invalid request" => "Ugyldig forespørgsel",
 "OpenID Changed" => "OpenID ændret",
+"Invalid request" => "Ugyldig forespørgsel",
 "Language changed" => "Sprog ændret",
 "__language_name__" => "Dansk",
+"Log" => "Log",
+"More" => "Mere",
+"Add your App" => "Tilføj din App",
 "Select an App" => "Vælg en App",
 "-licensed" => "-licenseret",
 "by" => "af",
+"Documentation" => "Dokumentation",
+"Managing Big Files" => "Håndter store filer",
 "Ask a question" => "Stil et spørgsmål",
 "Problems connecting to help database." => "Problemer med at forbinde til hjælpe-databasen.",
 "Go there manually." => "Gå derhen manuelt.",
 "Answer" => "Svar",
 "You use" => "Du benytter",
 "of the available" => "af det tilgængelige",
+"Desktop and Mobile Syncing Clients" => "Synkroniserings programmer for desktop og mobil",
+"Download" => "Download",
 "Your password got changed" => "Din adgangskode er blevet ændret",
 "Unable to change your password" => "Ude af stand til at ændre dit kodeord",
 "Current password" => "Nuværende adgangskode",
@@ -29,6 +35,8 @@
 "Password" => "Kodeord",
 "Groups" => "Grupper",
 "Create" => "Ny",
+"Default Quota" => "Standard kvote",
+"Other" => "Andet",
 "Quota" => "Kvote",
 "Delete" => "Slet"
 );
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 6c4cbc52c6..d1659e4d18 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "E-Mail wurde geändert",
-"Invalid request" => "Ungültige Anfrage",
 "OpenID Changed" => "OpenID geändert",
+"Invalid request" => "Ungültige Anfrage",
 "Language changed" => "Sprache geändert",
 "__language_name__" => "Deutsch",
 "Log" => "Log",
@@ -18,7 +17,7 @@
 "Answer" => "Antwort",
 "You use" => "Du nutzt",
 "of the available" => "der verfügbaren",
-"Desktop and Mobile Syncing Clients" => "Desktop und mobile Syncing Clienten",
+"Desktop and Mobile Syncing Clients" => "Desktop und mobile synchronierungs Clients",
 "Download" => "Download",
 "Your password got changed" => "Dein Passwort wurde geändert.",
 "Unable to change your password" => "Passwort konnte nicht geändert werden",
@@ -31,7 +30,7 @@
 "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" => "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.",
+"use this address to connect to your ownCloud in your file manager" => "Benutze diese Adresse, um deine ownCloud mit deinem Dateimanager zu verbinden.",
 "Name" => "Name",
 "Password" => "Passwort",
 "Groups" => "Gruppen",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 44875b8ef7..3d063daa3b 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "το email άλλαξε",
-"Invalid request" => "Μη έγκυρο αίτημα",
 "OpenID Changed" => "Το OpenID άλλαξε",
+"Invalid request" => "Μη έγκυρο αίτημα",
 "Language changed" => "Η γλώσσα άλλαξε",
 "__language_name__" => "__όνομα_γλώσσας__",
 "Log" => "Αρχείο καταγραφής",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 15010b47c9..c79817a272 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "La retpoŝtadreso estas ŝanĝita",
-"Invalid request" => "Nevalida peto",
 "OpenID Changed" => "La agordo de OpenID estas ŝanĝita",
+"Invalid request" => "Nevalida peto",
 "Language changed" => "La lingvo estas ŝanĝita",
 "__language_name__" => "Esperanto",
 "Log" => "Registro",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index adc1b5ff96..c8ddb412ec 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "correo electrónico actualizado",
-"Invalid request" => "Solicitud no válida",
 "OpenID Changed" => "OpenID cambiado",
+"Invalid request" => "Solicitud no válida",
 "Language changed" => "Idioma cambiado",
 "__language_name__" => "Castellano",
 "Log" => "Registro",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 905f02fcb7..75ba2b72f0 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "e-posti on muudetud",
-"Invalid request" => "Vigane päring",
 "OpenID Changed" => "OpenID on muudetud",
+"Invalid request" => "Vigane päring",
 "Language changed" => "Keel on muudetud",
 "__language_name__" => "Eesti",
 "Log" => "Logi",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 015746c61c..4ef58dd112 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "e-posta aldatuta",
-"Invalid request" => "Baliogabeko eskaria",
 "OpenID Changed" => "OpenID aldatuta",
+"Invalid request" => "Baliogabeko eskaria",
 "Language changed" => "Hizkuntza aldatuta",
 "__language_name__" => "Euskera",
 "More" => "Gehiago",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 745a6332a1..892de2d9ec 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "پست الکترونیکی تغییر کرد",
-"Invalid request" => "درخواست غیر قابل قبول",
 "OpenID Changed" => "OpenID تغییر کرد",
+"Invalid request" => "درخواست غیر قابل قبول",
 "Language changed" => "زبان تغییر کرد",
 "__language_name__" => "__language_name__",
 "Log" => "کارنامه",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
new file mode 100644
index 0000000000..76964b3080
--- /dev/null
+++ b/settings/l10n/fi_FI.php
@@ -0,0 +1,42 @@
+<?php $TRANSLATIONS = array(
+"OpenID Changed" => "OpenID on vaihdettu",
+"Invalid request" => "Virheellinen pyyntö",
+"Language changed" => "Kieli on vaihdettu",
+"__language_name__" => "_kielen_nimi_",
+"Log" => "Loki",
+"More" => "Lisää",
+"Add your App" => "Lisää ohjelmasi",
+"Select an App" => "Valitse ohjelma",
+"-licensed" => "-lisenssöity",
+"by" => "henkilölle",
+"Documentation" => "Dokumentaatio",
+"Managing Big Files" => "Suurten tiedostojen hallinta",
+"Ask a question" => "Kysy jotain",
+"Problems connecting to help database." => "Virhe yhdistettäessä tietokantaan.",
+"Go there manually." => "Ohje löytyy sieltä.",
+"Answer" => "Vastaus",
+"You use" => "Olet käyttänyt",
+"of the available" => "käytettävissäsi on yhteensä",
+"Desktop and Mobile Syncing Clients" => "Tietokoneen ja mobiililaitteiden synkronointisovellukset",
+"Download" => "Lataa",
+"Your password got changed" => "Salasanasi on vaihdettu",
+"Unable to change your password" => "Salasanaasi ei voitu vaihtaa",
+"Current password" => "Nykyinen salasana",
+"New password" => "Uusi salasana",
+"show" => "näytä",
+"Change password" => "Vaihda salasana",
+"Email" => "Sähköposti",
+"Your email address" => "Sähköpostiosoitteesi",
+"Fill in an email address to enable password recovery" => "Kirjoita sähköpostiosoitteesi alle, jotta unohdettu salasana voidaan palauttaa",
+"Language" => "Kieli",
+"Help translate" => "Auta kääntämisessä",
+"use this address to connect to your ownCloud in your file manager" => "voit yhdistää tiedostonhallintasovelluksellasi ownCloudiin käyttämällä tätä osoitetta",
+"Name" => "Nimi",
+"Password" => "Salasana",
+"Groups" => "Ryhmät",
+"Create" => "Luo",
+"Default Quota" => "Oletuskiintiö",
+"Other" => "Muu",
+"Quota" => "Kiintiö",
+"Delete" => "Poista"
+);
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 33e035b89f..7e9a92f6bb 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "e-mail modifié",
-"Invalid request" => "Requête invalide",
 "OpenID Changed" => "Identifiant OpenID changé",
+"Invalid request" => "Requête invalide",
 "Language changed" => "Langue changée",
 "__language_name__" => "Français",
 "Log" => "Journaux",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 51c5c93f58..0459d940b4 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,18 +1,24 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "Correo electrónico mudado",
-"Invalid request" => "Petición incorrecta",
 "OpenID Changed" => "Mudou o OpenID",
+"Invalid request" => "Petición incorrecta",
 "Language changed" => "O idioma mudou",
 "__language_name__" => "Galego",
+"Log" => "Conectar",
+"More" => "Máis",
+"Add your App" => "Engade o teu aplicativo",
 "Select an App" => "Escolla un Aplicativo",
 "-licensed" => "-licenciado",
 "by" => "por",
+"Documentation" => "Documentación",
+"Managing Big Files" => "Xestionar Grandes Ficheiros",
 "Ask a question" => "Pregunte",
 "Problems connecting to help database." => "Problemas conectando coa base de datos de axuda",
 "Go there manually." => "Ir manualmente.",
 "Answer" => "Resposta",
 "You use" => "Vostede usa",
 "of the available" => "dun total de",
+"Desktop and Mobile Syncing Clients" => "Cliente de sincronización de escritorio e móbil",
+"Download" => "Descargar",
 "Your password got changed" => "O seu contrasinal mudou",
 "Unable to change your password" => "Incapaz de trocar o seu contrasinal",
 "Current password" => "Contrasinal actual",
@@ -29,6 +35,8 @@
 "Password" => "Contrasinal",
 "Groups" => "Grupos",
 "Create" => "Crear",
+"Default Quota" => "Cuota por omisión",
+"Other" => "Outro",
 "Quota" => "Cota",
 "Delete" => "Borrar"
 );
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 93aab932b9..39055c2139 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -1,27 +1,42 @@
 <?php $TRANSLATIONS = array(
-"Invalid request" => "בקשה לא חוקית",
 "OpenID Changed" => "OpenID השתנה",
+"Invalid request" => "בקשה לא חוקית",
 "Language changed" => "שפה השתנתה",
+"__language_name__" => "עברית",
+"Log" => "יומן",
+"More" => "עוד",
+"Add your App" => "הוספת היישום שלך",
 "Select an App" => "בחירת יישום",
 "-licensed" => "רשיון",
 "by" => "מאת",
+"Documentation" => "תיעוד",
+"Managing Big Files" => "ניהול קבצים גדולים",
 "Ask a question" => "שאל שאלה",
 "Problems connecting to help database." => "בעיות בהתחברות לבסיס נתוני העזרה",
 "Go there manually." => "גש לשם באופן ידני",
 "Answer" => "מענה",
 "You use" => "הנך משתמש ",
 "of the available" => "מתוך ",
+"Desktop and Mobile Syncing Clients" => "לקוחות סנכרון למחשב שולחני ולנייד",
+"Download" => "הורדה",
 "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" => "השתמש בכתובת זו כדי להתחבר ל־ownCloude שלך ממנהל הקבצים",
 "Name" => "שם",
 "Password" => "ססמה",
 "Groups" => "קבוצות",
 "Create" => "יצירה",
+"Default Quota" => "מכסת בררת המחדל",
+"Other" => "אחר",
+"Quota" => "מכסה",
 "Delete" => "מחיקה"
 );
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 96181d737c..5f357a85d2 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -1,27 +1,42 @@
 <?php $TRANSLATIONS = array(
-"Invalid request" => "Neispravan zahtjev",
 "OpenID Changed" => "OpenID promijenjen",
+"Invalid request" => "Neispravan zahtjev",
 "Language changed" => "Jezik promijenjen",
+"__language_name__" => "__ime_jezika__",
+"Log" => "dnevnik",
+"More" => "više",
+"Add your App" => "Dodajte vašu aplikaciju",
 "Select an App" => "Odaberite Aplikaciju",
 "-licensed" => "-licencirano",
 "by" => "od",
+"Documentation" => "dokumentacija",
+"Managing Big Files" => "Upravljanje velikih datoteka",
 "Ask a question" => "Postavite pitanje",
 "Problems connecting to help database." => "Problem pri spajanju na bazu podataka pomoći",
 "Go there manually." => "Idite tamo ručno.",
 "Answer" => "Odgovor",
 "You use" => "Koristite",
 "of the available" => "od dostupno",
+"Desktop and Mobile Syncing Clients" => "Desktop i Mobile sinkronizaciji klijenti",
+"Download" => "preuzimanje",
 "Your password got changed" => "Vaša lozinka je promijenjena",
 "Unable to change your password" => "Nemoguće promijeniti lozinku",
 "Current password" => "Trenutna lozinka",
 "New password" => "Nova lozinka",
 "show" => "prikaz",
 "Change password" => "Izmjena lozinke",
+"Email" => "e-mail adresa",
+"Your email address" => "Vaša e-mail adresa",
+"Fill in an email address to enable password recovery" => "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke",
 "Language" => "Jezik",
+"Help translate" => "Pomoć prevesti",
 "use this address to connect to your ownCloud in your file manager" => "koristite ovu adresu za spajanje na Cloud u vašem upravitelju datoteka",
 "Name" => "Ime",
 "Password" => "Lozinka",
 "Groups" => "Grupe",
 "Create" => "Izradi",
+"Default Quota" => "standardni kvota",
+"Other" => "ostali",
+"Quota" => "kvota",
 "Delete" => "Obriši"
 );
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 704ccf7b58..7eb7772f6d 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "Email megváltozott",
-"Invalid request" => "Érvénytelen kérés",
 "OpenID Changed" => "OpenID megváltozott",
+"Invalid request" => "Érvénytelen kérés",
 "Language changed" => "A nyelv megváltozott",
 "__language_name__" => "__language_name__",
 "Log" => "Napló",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index ad1360f176..7b2b631b68 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Invalid request" => "Requesta invalide",
 "OpenID Changed" => "OpenID cambiate",
+"Invalid request" => "Requesta invalide",
 "Language changed" => "Linguage cambiate",
 "__language_name__" => "Interlingua",
 "Log" => "Registro",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 4a0bd17eaf..bf35b79240 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,27 +1,42 @@
 <?php $TRANSLATIONS = array(
-"Invalid request" => "Permintaan tidak valid",
 "OpenID Changed" => "OpenID telah dirubah",
+"Invalid request" => "Permintaan tidak valid",
 "Language changed" => "Bahasa telah diganti",
+"__language_name__" => "__language_name__",
+"Log" => "Log",
+"More" => "Lebih",
+"Add your App" => "Tambahkan App anda",
 "Select an App" => "Pilih satu aplikasi",
 "-licensed" => "-terlisensi",
 "by" => "oleh",
+"Documentation" => "Dokumentasi",
+"Managing Big Files" => "Mengelola berkas besar",
 "Ask a question" => "Ajukan pertanyaan",
 "Problems connecting to help database." => "Bermasalah saat menghubungi database bantuan.",
 "Go there manually." => "Pergi kesana secara manual.",
 "Answer" => "Jawab",
 "You use" => "Anda menggunakan",
 "of the available" => "dari yang tersedia",
+"Desktop and Mobile Syncing Clients" => "Klien sync Desktop dan Mobile",
+"Download" => "Unduh",
 "Your password got changed" => "Password anda telah dirubah",
 "Unable to change your password" => "Tidak dapat merubah password anda",
 "Current password" => "Password saat ini",
 "New password" => "Password baru",
 "show" => "perlihatkan",
 "Change password" => "Rubah password",
+"Email" => "Email",
+"Your email address" => "Alamat email anda",
+"Fill in an email address to enable password recovery" => "Masukkan alamat email untuk mengaktifkan pemulihan password",
 "Language" => "Bahasa",
+"Help translate" => "Bantu menerjemahkan",
 "use this address to connect to your ownCloud in your file manager" => "gunakan alamat ini untuk terhubung dengan ownCloud anda dalam file manager anda",
 "Name" => "Nama",
 "Password" => "Password",
 "Groups" => "Group",
 "Create" => "Buat",
+"Default Quota" => "Kuota default",
+"Other" => "Lain-lain",
+"Quota" => "Quota",
 "Delete" => "Hapus"
 );
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 6d746e76d7..a4b255546a 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "Email modificata",
-"Invalid request" => "Richiesta non valida",
 "OpenID Changed" => "OpenID modificato",
+"Invalid request" => "Richiesta non valida",
 "Language changed" => "Lingua modificata",
 "__language_name__" => "Italiano",
 "Log" => "Registro",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 6c0ce8ee15..69e5698374 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -1,34 +1,42 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "メールアドレスを変更しました",
-"Invalid request" => "無効なリクエストです",
 "OpenID Changed" => "OpenIDが変更されました",
+"Invalid request" => "無効なリクエストです",
 "Language changed" => "言語が変更されました",
-"__language_name__" => "Japanese(日本語)",
+"__language_name__" => "Japanese (日本語)",
+"Log" => "ログ",
+"More" => "もっと",
+"Add your App" => "アプリを追加",
 "Select an App" => "アプリを選択してください",
-"-licensed" => "権利を保持されています",
-"by" => "によって",
+"-licensed" => "ライセンス",
+"by" => "@",
+"Documentation" => "ドキュメント",
+"Managing Big Files" => "大きなファイルを扱うには",
 "Ask a question" => "質問してください",
-"Problems connecting to help database." => "ヘルプ用データベース接続に問題が生じました",
-"Go there manually." => "手動で移動してください",
+"Problems connecting to help database." => "ヘルプデータベースへの接続時に問題が発生しました",
+"Go there manually." => "手動で移動してください。",
 "Answer" => "解答",
-"You use" => "あなたが使っているのは",
-"of the available" => "です。利用可能容量は",
+"You use" => "あなたは",
+"of the available" => "を利用しています。利用可能容量：",
+"Desktop and Mobile Syncing Clients" => "デスクトップおよびモバイル用の同期クライアント",
+"Download" => "ダウンロード",
 "Your password got changed" => "パスワードは変更されました",
 "Unable to change your password" => "パスワードを変更することができません",
 "Current password" => "現在のパスワード",
 "New password" => "新しいパスワード",
 "show" => "表示",
-"Change password" => "パスワードを変更する",
-"Email" => "メールアドレス",
+"Change password" => "パスワードを変更",
+"Email" => "Email",
 "Your email address" => "あなたのメールアドレス",
-"Fill in an email address to enable password recovery" => "パスワードの回復を有効にするにはメールアドレスを入力してください",
+"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に接続するときはこのアドレスを使用してください",
+"Help translate" => "翻訳に協力する",
+"use this address to connect to your ownCloud in your file manager" => "ファイルマネージャーであなたのownCloudに接続する際は、このアドレスを使用してください",
 "Name" => "名前",
 "Password" => "パスワード",
 "Groups" => "グループ",
 "Create" => "作成",
+"Default Quota" => "デフォルトのクォータサイズ",
+"Other" => "その他",
 "Quota" => "クオータ",
 "Delete" => "削除"
 );
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index cd17cba4ee..a2c1210af6 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "전자 우편 주소 변경됨",
-"Invalid request" => "잘못된 요청",
 "OpenID Changed" => "OpenID 변경됨",
+"Invalid request" => "잘못된 요청",
 "Language changed" => "언어가 변경되었습니다",
 "__language_name__" => "한국어",
 "Log" => "로그",
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 30ad3947b9..29072720a0 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -1,27 +1,42 @@
 <?php $TRANSLATIONS = array(
-"Invalid request" => "Ongülteg Requête",
 "OpenID Changed" => "OpenID huet geännert",
+"Invalid request" => "Ongülteg Requête",
 "Language changed" => "Sprooch huet geännert",
+"__language_name__" => "__language_name__",
+"Log" => "Log",
+"More" => "Méi",
+"Add your App" => "Setz deng App bei",
 "Select an App" => "Wiel eng Applikatioun aus",
 "-licensed" => "-Lizenséiert",
 "by" => "vun",
+"Documentation" => "Dokumentatioun",
+"Managing Big Files" => "Grouss Fichieren verwalten",
 "Ask a question" => "Stell eng Fro",
 "Problems connecting to help database." => "Problemer sinn opgetrueden beim Versuch sech un d'Hëllef Datebank ze verbannen.",
 "Go there manually." => "Gei manuell dohinner.",
 "Answer" => "Äntwert",
 "You use" => "Du benotz",
 "of the available" => "vun den disponibelen",
+"Desktop and Mobile Syncing Clients" => "Desktop an Mobile Syncing Clienten",
+"Download" => "Download",
 "Your password got changed" => "Däin Passwuert ass geännert ginn",
 "Unable to change your password" => "Konnt däin Passwuert net änneren",
 "Current password" => "Momentan 't Passwuert",
 "New password" => "Neit Passwuert",
 "show" => "weisen",
 "Change password" => "Passwuert änneren",
+"Email" => "Email",
+"Your email address" => "Deng Email Adress",
+"Fill in an email address to enable password recovery" => "Gëff eng Email Adress an fir d'Passwuert recovery ze erlaben",
 "Language" => "Sprooch",
+"Help translate" => "Hëllef iwwersetzen",
 "use this address to connect to your ownCloud in your file manager" => "benotz dës Adress fir dech un deng ownCloud iwwert däin Datei Manager ze verbannen",
 "Name" => "Numm",
 "Password" => "Passwuert",
 "Groups" => "Gruppen",
 "Create" => "Erstellen",
+"Default Quota" => "Standard Quota",
+"Other" => "Aner",
+"Quota" => "Quota",
 "Delete" => "Läschen"
 );
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 3fd97c1388..504217a9db 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -1,16 +1,20 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "el. paštas pakeistas",
-"Invalid request" => "Klaidinga užklausa",
 "OpenID Changed" => "OpenID pakeistas",
+"Invalid request" => "Klaidinga užklausa",
 "Language changed" => "Kalba pakeista",
 "__language_name__" => "Kalba",
+"Log" => "Žurnalas",
+"More" => "Daugiau",
+"Add your App" => "Pridėti programėlę",
 "Select an App" => "Pasirinkite programą",
 "-licensed" => "-licencijuota",
+"Documentation" => "Dokumentacija",
 "Ask a question" => "Užduoti klausimą",
 "Problems connecting to help database." => "Problemos jungiantis prie duomenų bazės",
 "Answer" => "Atsakyti",
 "You use" => "Jūs naudojate",
 "of the available" => "iš galimų",
+"Download" => "Atsisiųsti",
 "Your password got changed" => "Jūsų slaptažodis buvo pakeistas",
 "Unable to change your password" => "Neįmanoma pakeisti slaptažodžio",
 "Current password" => "Dabartinis slaptažodis",
@@ -27,6 +31,8 @@
 "Password" => "Slaptažodis",
 "Groups" => "Grupės",
 "Create" => "Sukurti",
+"Default Quota" => "Numatytoji kvota",
+"Other" => "Kita",
 "Quota" => "Limitas",
 "Delete" => "Ištrinti"
 );
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index bf24e9e44b..4a61ba9d51 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "е-пошта е сменета",
-"Invalid request" => "неправилно барање",
 "OpenID Changed" => "OpenID сменето",
+"Invalid request" => "неправилно барање",
 "Language changed" => "Јазикот е сменет",
 "__language_name__" => "__language_name__",
 "Log" => "Записник",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index e763f76245..f0fba7a7c0 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "Emel berubah",
-"Invalid request" => "Permintaan tidak sah",
 "OpenID Changed" => "OpenID ditukar",
+"Invalid request" => "Permintaan tidak sah",
 "Language changed" => "Bahasa ditukar",
 "__language_name__" => "_nama_bahasa_",
 "Select an App" => "Pilih aplikasi",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 8a633ef431..1379bb9c2e 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "Epostadresse endret",
-"Invalid request" => "Ugyldig forespørsel",
 "OpenID Changed" => "OpenID endret",
+"Invalid request" => "Ugyldig forespørsel",
 "Language changed" => "Språk endret",
 "__language_name__" => "__language_name__",
 "Log" => "Logg",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index cca0067a2d..939907ef71 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "mailadres aangepast",
-"Invalid request" => "Ongeldig verzoek",
 "OpenID Changed" => "OpenID is aangepast",
+"Invalid request" => "Ongeldig verzoek",
 "Language changed" => "Taal aangepast",
 "__language_name__" => "Nederlands",
 "Log" => "Log",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 8b7adcd3b5..87c9cecb24 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "epost endra",
-"Invalid request" => "Ugyldig førespurnad",
 "OpenID Changed" => "OpenID endra",
+"Invalid request" => "Ugyldig førespurnad",
 "Language changed" => "Språk endra",
 "__language_name__" => "Nynorsk",
 "Select an App" => "Vel ein applikasjon",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index a3603bcbc6..d9dac06c00 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,18 +1,24 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "zmieniono adres e-mail",
-"Invalid request" => "Nieprawidłowe żądanie",
 "OpenID Changed" => "Zmieniono OpenID",
+"Invalid request" => "Nieprawidłowe żądanie",
 "Language changed" => "Język zmieniony",
 "__language_name__" => "Polski",
+"Log" => "Log",
+"More" => "Więcej",
+"Add your App" => "Dodaj aplikacje",
 "Select an App" => "Zaznacz aplikacje",
 "-licensed" => "-licencjonowany",
 "by" => "przez",
+"Documentation" => "Dokumentacja",
+"Managing Big Files" => "Zarządzanie dużymi plikami",
 "Ask a question" => "Zadaj pytanie",
 "Problems connecting to help database." => "Problem z połączeniem z bazą danych.",
 "Go there manually." => "Przejdź na stronę ręcznie.",
 "Answer" => "Odpowiedź",
 "You use" => "Używane",
 "of the available" => "z dostępnych",
+"Desktop and Mobile Syncing Clients" => "Klienci synchronizacji",
+"Download" => "Ściągnij",
 "Your password got changed" => "Zmieniono hasło",
 "Unable to change your password" => "Nie można zmienić hasła",
 "Current password" => "Bieżące hasło",
@@ -29,6 +35,8 @@
 "Password" => "Hasło",
 "Groups" => "Grupy",
 "Create" => "Utwórz",
+"Default Quota" => "Domyślny udział",
+"Other" => "Inne",
 "Quota" => "Udział",
 "Delete" => "Usuń"
 );
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 51b99382a4..35cf507194 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "email Alterado",
-"Invalid request" => "Pedido inválido",
 "OpenID Changed" => "Mudou OpenID",
+"Invalid request" => "Pedido inválido",
 "Language changed" => "Mudou Idioma",
 "__language_name__" => "Português",
 "Log" => "Log",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 20eaa7324d..af7088daa1 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,18 +1,24 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "endereço de email alterado",
-"Invalid request" => "Pedido inválido",
 "OpenID Changed" => "OpenID alterado",
+"Invalid request" => "Pedido inválido",
 "Language changed" => "Idioma alterado",
 "__language_name__" => "__language_name__",
+"Log" => "Log",
+"More" => "Mais",
+"Add your App" => "Adicione a sua aplicação",
 "Select an App" => "Selecione uma aplicação",
 "-licensed" => "-licenciado",
 "by" => "por",
+"Documentation" => "Documentação",
+"Managing Big Files" => "Gestão de ficheiros grandes",
 "Ask a question" => "Coloque uma questão",
 "Problems connecting to help database." => "Problemas ao conectar à base de dados de ajuda",
 "Go there manually." => "Vá lá manualmente",
 "Answer" => "Resposta",
 "You use" => "Está a usar",
 "of the available" => "do disponível",
+"Desktop and Mobile Syncing Clients" => "Clientes de sincronização desktop e movel",
+"Download" => "Transferir",
 "Your password got changed" => "A sua palavra-chave foi alterada",
 "Unable to change your password" => "Não foi possivel alterar a sua palavra-chave",
 "Current password" => "Palavra-chave atual",
@@ -29,6 +35,8 @@
 "Password" => "Palavra-chave",
 "Groups" => "Grupos",
 "Create" => "Criar",
+"Default Quota" => "Quota por defeito",
+"Other" => "Outro",
 "Quota" => "Quota",
 "Delete" => "Apagar"
 );
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 9a7510d12c..1b69b7a84f 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,18 +1,24 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "email schimbat",
-"Invalid request" => "Cerere eronată",
 "OpenID Changed" => "OpenID schimbat",
+"Invalid request" => "Cerere eronată",
 "Language changed" => "Limba a fost schimbată",
 "__language_name__" => "_language_name_",
+"Log" => "Jurnal de activitate",
+"More" => "Mai mult",
+"Add your App" => "Adaugă aplicația ta",
 "Select an App" => "Selectează o aplicație",
 "-licensed" => "-autorizat",
 "by" => "de",
+"Documentation" => "Documetație",
+"Managing Big Files" => "Gestionînd fișiere mari",
 "Ask a question" => "Întreabă",
 "Problems connecting to help database." => "Probleme de conectare la baza de date.",
 "Go there manually." => "Pe cale manuală.",
 "Answer" => "Răspuns",
 "You use" => "Utilizezi",
 "of the available" => "din cele diponibile",
+"Desktop and Mobile Syncing Clients" => "Clienți de sincronizare pentru telefon mobil și desktop",
+"Download" => "Descărcări",
 "Your password got changed" => "Parola ta s-a schimbat",
 "Unable to change your password" => "Imposibil de-ați schimbat parola",
 "Current password" => "Parola curentă",
@@ -29,6 +35,8 @@
 "Password" => "Parolă",
 "Groups" => "Grupuri",
 "Create" => "Crează",
+"Default Quota" => "Cotă implicită",
+"Other" => "Altele",
 "Quota" => "Cotă",
 "Delete" => "Șterge"
 );
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index dfe75e5e52..4ab514815c 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,18 +1,24 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "адрес электронной почты изменён",
+"OpenID Changed" => "OpenID изменён",
 "Invalid request" => "Неверный запрос",
-"OpenID Changed" => "OpenID был изменён",
 "Language changed" => "Язык изменён",
 "__language_name__" => "Русский ",
+"Log" => "Журнал",
+"More" => "Ещё",
+"Add your App" => "Добавить приложение",
 "Select an App" => "Выберите приложение",
 "-licensed" => "-лицензия",
 "by" => "от",
+"Documentation" => "Документация",
+"Managing Big Files" => "Управление большими файлами",
 "Ask a question" => "Задать вопрос",
 "Problems connecting to help database." => "Проблема соединения с базой данных помощи.",
 "Go there manually." => "Войти самостоятельно.",
 "Answer" => "Ответ",
 "You use" => "Вы используете",
 "of the available" => "из доступных",
+"Desktop and Mobile Syncing Clients" => "Клиенты синхронизации для рабочих станций и мобильных устройств",
+"Download" => "Загрузка",
 "Your password got changed" => "Ваш пароль был изменён",
 "Unable to change your password" => "Невозможно сменить пароль",
 "Current password" => "Текущий пароль",
@@ -29,6 +35,8 @@
 "Password" => "Пароль",
 "Groups" => "Группы",
 "Create" => "Создать",
+"Default Quota" => "Квота по умолчанию",
+"Other" => "Другое",
 "Quota" => "Квота",
 "Delete" => "Удалить"
 );
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index e465a149cf..fe755aecb4 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "email zmenený",
-"Invalid request" => "Neplatná požiadavka",
 "OpenID Changed" => "OpenID zmenené",
+"Invalid request" => "Neplatná požiadavka",
 "Language changed" => "Jazyk zmenený",
 "__language_name__" => "Slovensky",
 "Log" => "Záznam",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index b83a3f343e..58afe21f45 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "E-poštni naslov je bil spremenjen",
-"Invalid request" => "Neveljaven zahtevek",
 "OpenID Changed" => "OpenID je bil spremenjen",
+"Invalid request" => "Neveljaven zahtevek",
 "Language changed" => "Jezik je bil spremenjen",
 "__language_name__" => "__ime_jezika__",
 "Log" => "Dnevnik",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index c1e24be67c..7dede8fdc7 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Invalid request" => "Неисправан захтев",
 "OpenID Changed" => "OpenID је измењен",
+"Invalid request" => "Неисправан захтев",
 "Language changed" => "Језик је измењен",
 "Select an App" => "Изаберите програм",
 "-licensed" => "-лиценциран",
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 8638a6436b..0229a76361 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Invalid request" => "Neispravan zahtev",
 "OpenID Changed" => "OpenID je izmenjen",
+"Invalid request" => "Neispravan zahtev",
 "Language changed" => "Jezik je izmenjen",
 "Select an App" => "Izaberite program",
 "-licensed" => "-licenciran",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 52dd29c56b..40a370aabe 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,18 +1,24 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "Epost ändrad",
-"Invalid request" => "Ogiltig begäran",
 "OpenID Changed" => "OpenID ändrat",
+"Invalid request" => "Ogiltig begäran",
 "Language changed" => "Språk ändrades",
 "__language_name__" => "__language_name__",
+"Log" => "Logg",
+"More" => "Mera",
+"Add your App" => "Lägg till din applikation",
 "Select an App" => "Välj en App",
 "-licensed" => "-licensierat",
 "by" => "av",
+"Documentation" => "Dokumentation",
+"Managing Big Files" => "Hantering av stora filer",
 "Ask a question" => "Ställ en fråga",
 "Problems connecting to help database." => "Problem med att ansluta till hjälp-databasen.",
 "Go there manually." => "Gå dit manuellt",
 "Answer" => "Svar",
 "You use" => "Du använder",
 "of the available" => "av tillgängliga",
+"Desktop and Mobile Syncing Clients" => "Synkroniseringsklienter för dator och mobil",
+"Download" => "Ladda ner",
 "Your password got changed" => "Ditt lösenord ändrades",
 "Unable to change your password" => "Kunde inte ändra ditt lösenord",
 "Current password" => "Nuvarande lösenord",
@@ -29,6 +35,8 @@
 "Password" => "Lösenord",
 "Groups" => "Grupper",
 "Create" => "Skapa",
+"Default Quota" => "Förvald datakvot",
+"Other" => "Annat",
 "Quota" => "Kvot",
 "Delete" => "Ta bort"
 );
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 47c20bd911..5b744cb6be 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "อีเมล์ถูกเปลี่ยนแล้ว",
-"Invalid request" => "คำร้องขอไม่ถูกต้อง",
 "OpenID Changed" => "เปลี่ยนชื่อบัญชี OpenID แล้ว",
+"Invalid request" => "คำร้องขอไม่ถูกต้อง",
 "Language changed" => "เปลี่ยนภาษาเรียบร้อยแล้ว",
 "__language_name__" => "ภาษาไทย",
 "Log" => "บันทึกการเปลี่ยนแปลง",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 8c065575e9..01ad142a3d 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "eposta Değiştirildi",
-"Invalid request" => "Geçersiz istek",
 "OpenID Changed" => "OpenID Değiştirildi",
+"Invalid request" => "Geçersiz istek",
 "Language changed" => "Dil değiştirildi",
 "__language_name__" => "__dil_adı__",
 "Log" => "Günlük",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 9e89be0dcb..d274b372ee 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,18 +1,24 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "电子邮件已修改",
-"Invalid request" => "非法请求",
 "OpenID Changed" => "OpenID 已修改",
+"Invalid request" => "非法请求",
 "Language changed" => "语言已修改",
 "__language_name__" => "简体中文",
+"Log" => "日志",
+"More" => "更多",
+"Add your App" => "添加应用",
 "Select an App" => "选择一个应用",
 "-licensed" => "-许可证",
 "by" => "由",
+"Documentation" => "文档",
+"Managing Big Files" => "管理大文件",
 "Ask a question" => "提问",
 "Problems connecting to help database." => "连接帮助数据库错误 ",
 "Go there manually." => "手动访问",
 "Answer" => "回答",
 "You use" => "您使用了",
 "of the available" => "的空间，总容量为",
+"Desktop and Mobile Syncing Clients" => "桌面和移动设备同步程序",
+"Download" => "下载",
 "Your password got changed" => "密码已修改",
 "Unable to change your password" => "无法修改密码",
 "Current password" => "当前密码",
@@ -29,6 +35,8 @@
 "Password" => "密码",
 "Groups" => "组",
 "Create" => "创建",
+"Default Quota" => "默认配额",
+"Other" => "其它",
 "Quota" => "配额",
 "Delete" => "删除"
 );
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 2132bef03e..aeb1db4871 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"email Changed" => "電子郵件已變更",
-"Invalid request" => "無效請求",
 "OpenID Changed" => "OpenID 已變更",
+"Invalid request" => "無效請求",
 "Language changed" => "語言已變更",
 "__language_name__" => "__語言_名稱__",
 "Log" => "紀錄",
diff --git a/tests/lib/cache.php b/tests/lib/cache.php
new file mode 100644
index 0000000000..bb5cfc6ee1
--- /dev/null
+++ b/tests/lib/cache.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+abstract class Test_Cache extends UnitTestCase {
+	/**
+	 * @var OC_Cache cache;
+	 */
+	protected $instance;
+
+	public function tearDown(){
+		$this->instance->clear();
+	}
+
+	function testSimple(){
+		$this->assertNull($this->instance->get('value1'));
+		$this->assertFalse($this->instance->hasKey('value1'));
+		
+		$value='foobar';
+		$this->instance->set('value1',$value);
+		$this->assertTrue($this->instance->hasKey('value1'));
+		$received=$this->instance->get('value1');
+		$this->assertEqual($value,$received,'Value recieved from cache not equal to the original');
+		$value='ipsum lorum';
+		$this->instance->set('value1',$value);
+		$received=$this->instance->get('value1');
+		$this->assertEqual($value,$received,'Value not overwritten by second set');
+
+		$value2='foobar';
+		$this->instance->set('value2',$value2);
+		$received2=$this->instance->get('value2');
+		$this->assertTrue($this->instance->hasKey('value1'));
+		$this->assertTrue($this->instance->hasKey('value2'));
+		$this->assertEqual($value,$received,'Value changed while setting other variable');
+		$this->assertEqual($value2,$received2,'Second value not equal to original');
+
+		$this->assertFalse($this->instance->hasKey('not_set'));
+		$this->assertNull($this->instance->get('not_set'),'Unset value not equal to null');
+
+		$this->assertTrue($this->instance->remove('value1'));
+	}
+
+	function testTTL(){
+		$value='foobar';
+		$this->instance->set('value1',$value,1);
+		$value2='foobar';
+		$this->instance->set('value2',$value2);
+		sleep(2);
+		$this->assertFalse($this->instance->hasKey('value1'));
+		$this->assertNull($this->instance->get('value1'));
+		$this->assertTrue($this->instance->hasKey('value2'));
+		$this->assertEqual($value2,$this->instance->get('value2'));
+	}
+}
diff --git a/tests/lib/cache/apc.php b/tests/lib/cache/apc.php
new file mode 100644
index 0000000000..ab8eb18866
--- /dev/null
+++ b/tests/lib/cache/apc.php
@@ -0,0 +1,36 @@
+<?php
+/**
+* ownCloud
+*
+* @author Robin Appelman
+* @copyright 2012 Robin Appelman icewind@owncloud.com
+*
+* 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 Test_Cache_APC extends Test_Cache {
+	function skip() {
+		$this->skipUnless(function_exists('apc_store'));
+	}
+
+	public function setUp(){
+		$this->instance=new OC_Cache_APC();
+	}
+
+	function testTTL(){
+		// ttl doesn't work correctly in the same request
+		// see https://bugs.php.net/bug.php?id=58084
+	}
+}
diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
new file mode 100644
index 0000000000..226e5068c4
--- /dev/null
+++ b/tests/lib/cache/file.php
@@ -0,0 +1,27 @@
+<?php
+/**
+* ownCloud
+*
+* @author Robin Appelman
+* @copyright 2012 Robin Appelman icewind@owncloud.com
+*
+* 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 Test_Cache_File extends Test_Cache {
+	public function setUp(){
+		$this->instance=new OC_Cache_File();
+	}
+}
diff --git a/tests/lib/cache/xcache.php b/tests/lib/cache/xcache.php
new file mode 100644
index 0000000000..a5e954f827
--- /dev/null
+++ b/tests/lib/cache/xcache.php
@@ -0,0 +1,31 @@
+<?php
+/**
+* ownCloud
+*
+* @author Robin Appelman
+* @copyright 2012 Robin Appelman icewind@owncloud.com
+*
+* 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 Test_Cache_XCache extends Test_Cache {
+	function skip() {
+		$this->skipUnless(function_exists('xcache_get'));
+	}
+
+	public function setUp(){
+		$this->instance=new OC_Cache_XCache();
+	}
+}