Merge branch 'master' into gallery

2024-12-02 06:24:11 +01:00 · 2012-11-07 17:19:52 +01:00 · 2012-11-07 17:19:52 +01:00 · 034969a6a3
commit 034969a6a3
parent 879124f0e0 c2a45c1338
63 changed files with 236 additions and 455 deletions
--- a/3rdparty/js/tag-it.js
+++ b/3rdparty/js/tag-it.js
@ -34,7 +34,7 @@
            tagSource         : null,
            removeConfirmation: false,
            caseSensitive     : true,
-
+            placeholderText   : null,
            // When enabled, quotes are not neccesary
            // for inputting multi-word tags.
            allowSpaces: false,
@ -97,7 +97,9 @@
            if (this.options.tabIndex) {
                this._tagInput.attr('tabindex', this.options.tabIndex);
            }
-
+            if (this.options.placeholderText) {
+                this._tagInput.attr('placeholder', this.options.placeholderText);
+            }
            this.options.tagSource = this.options.tagSource || function(search, showChoices) {
                var filter = search.term.toLowerCase();
                var choices = $.grep(that.options.availableTags, function(element) {
--- a/ajax/changescreen.php
+++ b/ajax/changescreen.php
@ -1,29 +0,0 @@
-<?php
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('bookmarks');
-if(isset($_POST['view'])) {
-	$view = $_POST['view'];
-	switch($view){
-		case 'list':
-		case 'image';
-			break;
-		default:
-			OCP\JSON::error(array('message'=>'unexspected parameter: ' . $view));
-			exit;
-	}
-	OCP\Config::setUserValue(OCP\USER::getUser(), 'bookmarks', 'currentview', $view);
-	OCP\JSON::success();
-}elseif(isset($_POST['sidebar'])) {
-	$view = $_POST['sidebar'];
-	switch($view){
-		case 'true':
-		case 'false';
-			break;
-		default:
-			OCP\JSON::error(array('message'=>'unexspected parameter: ' . $view));
-			exit;
-	}
-	OCP\Config::setUserValue(OCP\USER::getUser(), 'bookmarks', 'sidebar', $view);
-	OCP\JSON::success();
-}
--- a/ajax/editBookmark.php
+++ b/ajax/editBookmark.php
@ -26,20 +26,27 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();

 OCP\JSON::checkAppEnabled('bookmarks');
+require_once OC_App::getAppPath('bookmarks').'/bookmarksHelper.php';

 // If we go the dialog form submit
 if(isset($_POST['url'])) {
+	$title = '';
 	$tags = isset($_POST['item']['tags']) ? $_POST['item']['tags'] : array();
 	$pub = isset($_POST['is_public']) ? true : false;

 	if(isset($_POST['record_id']) && is_numeric($_POST['record_id']) ) { //EDIT
 		$bm = $_POST['record_id'];
 		OC_Bookmarks_Bookmarks::editBookmark($bm, $_POST['url'], $_POST['title'], $tags, $_POST['description'], $pub);
+		$title = $_POST['title'];
 	}
 	else {
-		$bm = OC_Bookmarks_Bookmarks::addBookmark($_POST['url'], $_POST['title'], $tags, $_POST['description'], $pub);
+		if(isset($_POST['from_own'])) {
+			$datas = getURLMetadata($_POST['url']);
+			if(isset($datas['title'])) $title = $datas['title'];
+		}
+		$bm = OC_Bookmarks_Bookmarks::addBookmark($_POST['url'], $title, $tags, $_POST['description'], $pub);
 	}
-	OCP\JSON::success(array('id'=>$bm));
+	OCP\JSON::success(array('id'=>$bm,'title'=>$title));
 	exit();
 }
 OC_JSON::error();
--- a/css/bookmarks.css
+++ b/css/bookmarks.css
@ -1,30 +1,22 @@
 #content { overflow: auto; height: 100%; }
-#firstrun { width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em;  color:#777; position: relative;}
-#firstrun small { display: block; font-weight: normal; font-size: 0.5em; margin-bottom: 1.5em; }
+#firstrun, #firstrun_setting{ width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em;  color:#777; position: relative;}
+#firstrun small { display: block; font-weight: normal; font-size: 0.5em;  }
 #firstrun .button { font-size: 0.7em; }
 #firstrun #selections { font-size:0.8em;  font-weight: normal; width: 100%; margin: 2em auto auto auto; clear: both; }
+#firstrun_setting { font-size: 100%; text-decoration: underline}

+input.disabled, input.disabled:hover {
+  	cursor: not-allowed;
+	background-color: #ddd;
+	color: gray;
+}
 #leftcontent {
-    padding-top: 1em;
+	top: 4em !important;
 }

 #rightcontent {
-    padding-top: 5px;
-    top: 3.5em !important;
-}
-.centercontent {
-  margin-bottom: 1em;
-	text-align: right;
-}
-.centercontent span {
-	border: 1px solid lightgray;
-	border-right:0;
-  border-radius: 0.5em 0em 0em 0.5em;
-  padding: 3px;
-}
-
-.centercontent .right_img {
-	display:none;
+    	padding-top: 5px;
+    	top: 1em !important;
 }

 .bookmarks_headline {
@ -41,12 +33,18 @@

 .bookmarks_list {
 	overflow: auto;
-	position: fixed;
-	top: 6.5em;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	padding-top: 3em;
+	width: 100%;
+	height: 100%;
 }

+#add_form {
+	padding-bottom: 2em;
+}
 #add_url {
-	width: 25em;
+	width: 12em;
 }
 .bookmarks_addBml {
 	text-decoration: underline;
@ -65,16 +63,19 @@
 .bookmark_actions {
 	position: absolute;
 	right: 1em;
-	top: 0.7em;
+	bottom:0.3em;
 	display: none;
 }
 .bookmark_actions span { margin: 0 0.4em; }
 .bookmark_actions img { opacity: 0.3; }
 .bookmark_actions img:hover { opacity: 1; cursor: pointer; }
+.bookmark_edit img {opacity:0.3;}
+.bookmark_edit img:hover {cursor: pointer; opacity: 1;}

 .bookmark_single {
 	position: relative;
 	padding: 0.5em 1em;
+        min-height: 3em;
 	border-bottom: 1px solid #DDD;
 	-webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms;
 }
@ -117,10 +118,10 @@

 .addBm {
 	background: none repeat scroll 0 0 #F8F8F8;
-  border-radius: 0.5em 0.5em 0.5em 0.5em;
-  color: #555555;
-  margin: 1em;
-  padding: 0.5em 1em;
+	border-radius: 0.5em 0.5em 0.5em 0.5em;
+	color: #555555;
+	margin: 1em;
+	padding: 0.5em 1em;
 	text-shadow: 0 1px 0 #FFFFFF;
 	width: 500px;
 	
@ -131,7 +132,6 @@
 .addBm h1 {
 	font-weight: bold;
 	border-bottom: 1px solid #BABABA;
-
 }


@ -183,14 +183,14 @@
 }

 #leftcontent .tag_list > li .tag , #leftcontent .share_list > li .tag{
-		background: none repeat scroll 0 0 #DEE7F8;
-    border: 1px solid #CAD8F3;
-    border-radius: 6px 6px 6px 6px;
-    color: #555555;
-    font-weight: normal;
-		float:left;
-		padding: 0.3em;
-    position: relative;
+	background: none repeat scroll 0 0 #DEE7F8;
+	border: 1px solid #CAD8F3;
+	border-radius: 6px 6px 6px 6px;
+	color: #555555;
+	font-weight: normal;
+	float:left;
+	padding: 0.3em;
+    	position: relative;
 }

 ul.tagit li.tagit-new {
@ -211,7 +211,7 @@ li:hover .tags_actions {
 }
 li:hover em { display : none; }
 #tag_filter li, #tag_filter li:hover{
-	    background: none repeat scroll 0 0 #F8F8F8;
+	background: none repeat scroll 0 0 #F8F8F8;

 }
 #tag_filter .tagit {
@ -221,64 +221,37 @@ li:hover em { display : none; }
 	padding:0;
 }
 #tag_filter ul.tagit li.tagit-choice {
-    background: none repeat scroll 0 0 #DEE7F8;
-		padding: 0.2em 18px 0.2em 0.5em;
+	background: none repeat scroll 0 0 #DEE7F8;
+	padding: 0.2em 18px 0.2em 0.5em;
 }

 #tag_filter a {
-    display: inline;
-    float: none;
-    margin: 0;
-    padding: 0;
+	display: inline;
+	float: none;
+ 	margin: 0;
+	padding: 0;
 }
 #tag_filter ul.tagit li.tagit-choice .close{
-		margin-top: -8px;
-		cursor: pointer;
-    margin-top: -8px;
-    position: absolute;
-    right: 0.1em;
-    top: 50%;
-}
-
-#view_type {
-	display:none; /* @TODO: Remove when image view is ready*/
-	position: absolute;
-	right: 33.5em;
-	top: 0;
-}
-
-/***** Lis View *****/
-
-.bm_view_img .bookmark_single{
-	width: 240px;
-	float: left;
-	height: 240px;
-	margin: 1em;
-  border-radius: 8px 8px 8px 8px;
-  box-shadow: 0 0 5px rgba(34, 25, 25, 0.5);
-}
-
-.bm_view_img .bookmark_single .shot{
-	text-align:center;
-}
-.bm_view_img .bookmark_single .shot img{
-	border: 1px solid black;
-	width: 228px;
-	height: 160px
+	margin-top: -8px;
+	cursor: pointer;
+    	margin-top: -8px;
+    	position: absolute;
+	right: 0.1em;
+	top: 50%;
 }

 .bookmark_desc{
 	height: 1.5em;
 	padding-left:1em;
 	white-space:nowrap;
-  text-overflow:ellipsis;
-  overflow:hidden;
-  display:block;
+	text-overflow:ellipsis;
+	overflow:hidden;
+	display:block;
 }
 .bookmark_date, .bookmark_submit {
 	font-size:small;
 	position: absolute;
-  right: 6em;
+	right: 6em;
 	color:gray;
 /* 	margin-top:2.5em; */
 	margin-right: 0.2em;
@ -307,31 +280,31 @@ li:hover em { display : none; }
 }

 .bookmark_single_form .tagit{
-   width: 80%;
+	width: 80%;
 	box-shadow: 0 1px 1px #FFFFFF, 0 1px 0 #BBBBBB inset;
 	margin: 3px;
 }
 .bm_view_img .bookmark_actions {
-    bottom: 0.7em;
-    display: block;
-    position: absolute;
-    right: 1em;
-		top: auto;
+	bottom: 0.7em;
+	display: block;
+	position: absolute;
+	right: 1em;
+	top: auto;
 }

 #bookmark_settings {
-    -moz-box-sizing: border-box;
-    background: none repeat scroll 0 0 #EEEEEE;
-    border-right: 1px solid #CCCCCC;
-    border-top: 1px solid #CCCCCC;
-    bottom: 0;
-    height: 2.8em;
-    margin: 0;
-    overflow: visible;
-    padding: 0;
-    position: fixed;
-    width: 20em;
-    z-index: 2;
+	-moz-box-sizing: border-box;
+	background: none repeat scroll 0 0 #EEEEEE;
+	border-right: 1px solid #CCCCCC;
+	border-top: 1px solid #CCCCCC;
+ 	bottom: 0;
+	height: 2.8em;
+	margin: 0;
+	overflow: visible;
+	padding: 0;
+	position: fixed;
+	width: 20em;
+	z-index: 2;
 }

 #leftcontent #bookmark_settings li{
@ -343,30 +316,30 @@ li:hover em { display : none; }
 }

 #bookmark_settings .controls {
-    height: 2.8em;
-    width: 100%;
+	height: 2.8em;
+	width: 100%;
 }

 #bookmark_settings .controls > li:last-child button {
-    margin-right: 0.3em;
+	margin-right: 0.3em;
 }
 #bookmark_settings .controls button {
-    height: 2.4em;
-    margin: 0.15em 0 0 0.15em;
-    padding: 0.2em 0.1em 0;
-    width: 2.4em;
+	height: 2.4em;
+	margin: 0.15em 0 0 0.15em;
+	padding: 0.2em 0.1em 0;
+	width: 2.4em;
 }

 #bookmark_settings.open {
-	height: 300px;
+	height: auto;
 }
 #bm_setting_panel {
-	background-color: white;
+	background-color: #eee;
 	padding: 1em;
 	height: 100%;
-	display:none;
+/* 	display:none; */
 }
-.open #bm_setting_panel { display:block; }
+/* .open #bm_setting_panel { display:block; } */

 #bm_setting_panel legend{
 	margin-top: 0.5em;
--- a/export.php
+++ b/export.php
@ -10,6 +10,14 @@
 OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('bookmarks');

+function getDomainWithoutExt($name){
+    $pos = strripos($name, '.');
+    if($pos === false){
+        return $name;
+    }else{
+        return substr($name, 0, $pos);
+    }
+}

 $file = <<<EOT
 <!DOCTYPE NETSCAPE-Bookmark-file-1>
@ -21,11 +29,15 @@ Do Not Edit! -->
 <H1>Bookmarks</H1>
 <DL><p>
 EOT;
-
 $bookmarks = OC_Bookmarks_Bookmarks::findBookmarks(0, 'id', array(), true, -1);
 foreach($bookmarks as $bm) {
+	$title = $bm['title'];
+	if(trim($title) ===''){
+		$url_parts = parse_url($bm['url']);
+		$title = isset($url_parts['host']) ? getDomainWithoutExt($url_parts['host']) : $bm['url'];
+	}
 	$file .= '<DT><A HREF="'.$bm['url'].'" TAGS="'.implode(',', $bm['tags']).'">';
-	$file .= htmlspecialchars($bm['title'], ENT_QUOTES, 'UTF-8').'</A>';
+	$file .= htmlspecialchars($title, ENT_QUOTES, 'UTF-8').'</A>';
 	if($bm['description'])
 		$file .= '<DD>'.htmlspecialchars($bm['description'], ENT_QUOTES, 'UTF-8');
 }
--- a/js/bookmarks.js
+++ b/js/bookmarks.js
@ -3,36 +3,25 @@ var bookmarks_loading = false;
 var dialog;
 var bookmarks_sorting = 'bookmarks_sorting_recent';

-var bookmark_view = 'image';
-
 $(document).ready(function() {
-	$('.centercontent').click(clickSideBar);
-	$('#view_type input').click(clickSwitchView);
-	$('#bookmark_add_submit').click(addBookmark);
-
-// 	$('#bm_import_submit').click(attachSettingEvent);
+	watchUrlField();
 	$('#bm_import').change(attachSettingEvent);
-  $('#settingsbtn').on('click keydown', function() {
-		$('#bookmark_settings').toggleClass('open');
-	});
+	$('#add_url').on('keydown keyup change click', watchUrlField);
+  $('#settingsbtn').on('click keydown', toggleSettings);
 	$('#bm_export').click(exportBm);
-
-	$(window).resize(function () {
-		fillWindow($('.bookmarks_list'));
+	$('#firstrun_setting').click(function(){
+		if(! $('#bookmark_settings').hasClass('open')){
+			$('#settingsbtn').click();
+		}
 	});
-	$(window).resize();
-	$('.bookmarks_list').scroll(updateOnBottom).empty().width($('#rightcontent').width());
+	$('.bookmarks_list').scroll(updateOnBottom).empty();
 	$('#tag_filter input').tagit({
 		allowSpaces: true,
 		availableTags: fullTags,
-		onTagFinishRemoved: filterTagsChanged
+		onTagFinishRemoved: filterTagsChanged,
+		placeholderText: t('bookmark', 'Filter by tag')
 	}).tagit('option', 'onTagAdded', filterTagsChanged);
 	getBookmarks();
-	
-	if(init_sidebar != 'true')
-		toggleSideBar();
-	bookmark_view = init_view;
-	switchView();
 });


@ -48,50 +37,20 @@ var formatString = (function() {
 	};
 })();

-function clickSideBar() {
-	$.post(OC.filePath('bookmarks', 'ajax', 'changescreen.php'), {sidebar: $('.right_img').is(':visible')});
-	toggleSideBar();
-}
-
-function toggleSideBar(){
-	var left_pan_visible = $('.right_img').is(':visible');
-	anim_duration = 1000;
-	if( left_pan_visible) { // then show the left panel
-		$('#rightcontent').animate({'left':'32.5em'},{duration: anim_duration, queue: false });
-		$('.bookmarks_list').animate({'width': '-=15em'},{duration: anim_duration, queue: false });
-		$('#leftcontent').animate({'margin-left':'0', 'opacity': 1},{duration: anim_duration, queue: false, complete: function() { $(window).trigger('resize'); }});
-		$('.right_img').hide();
-		$('.left_img').show();
-		
-	} else { // hide the left panel
-		$('#rightcontent').animate({'left':'15.5em'},{duration: anim_duration, queue: false });
-		$('.bookmarks_list').animate({'width': '+=15em'},{duration: anim_duration, queue: false });
-		$('#leftcontent').animate({'margin-left':'-17em', 'opacity': 0.5 },{duration: anim_duration, queue: false, complete: function() { $(window).trigger('resize'); } });
-		$('.left_img').hide();
-		$('.right_img').show();
+function watchClickInSetting(e){
+	if($('#bookmark_settings').find($(e.target)).length == 0){
+		toggleSettings();
 	}
 }
-
-function clickSwitchView(){
-	$.post(OC.filePath('bookmarks', 'ajax', 'changescreen.php'), {view:bookmark_view});
-	switchView();
-}
-
-function switchView(){
-	if(bookmark_view == 'list') { //Then switch to img
-		$('.bookmarks_list').addClass('bm_view_img');
-		$('.bookmarks_list').removeClass('bm_view_list');
-		$('#view_type input.image').hide();
-		$('#view_type input.list').show();
-		bookmark_view = 'image';
-	} else { // Then Image
-		$('.bookmarks_list').addClass('bm_view_list');
-		$('.bookmarks_list').removeClass('bm_view_img');
-		$('#view_type input.list').hide();
-		$('#view_type input.image').show();
-		bookmark_view = 'list';
+function toggleSettings() {
+	if( $('#bookmark_settings').hasClass('open')) { //Close
+		$('#bookmark_settings').switchClass( "open", "" );
+		$('body').unbind('click');
+	}
+	else {		
+		$('#bookmark_settings').switchClass( "", "open");
+		$('body').bind('click',watchClickInSetting);
 	}
-	filterTagsChanged(); //Refresh the view
 }
 function addFilterTag(event) {
 	event.preventDefault();
@ -150,11 +109,8 @@ function getBookmarks() {

 			for(var i in bookmarks.data) {
 				updateBookmarksList(bookmarks.data[i]);
-				$("#firstrun").hide();
-			}
-			if($('.bookmarks_list').is(':empty')) {
-				$("#firstrun").show();
 			}
+			checkEmpty();

 			$('.bookmark_link').click(recordClick);
 			$('.bookmark_delete').click(delBookmark);
@ -189,10 +145,35 @@ function createEditDialog(record){
 	});
 }

+function watchUrlField(){
+	var form = $('#add_form');
+	var el = $('#add_url');
+	var button = $('#bookmark_add_submit');
+	form.unbind('submit');
+	if(! acceptUrl(el.val()) ) {
+		form.bind('submit',function(e){e.preventDefault()});
+		button.addClass('disabled');
+	}
+	else{
+		button.removeClass('disabled');
+		form.bind('submit',addBookmark);
+	}
+}
+
+function acceptUrl(url) {
+	return url.replace(/^\s+/g,'').replace(/\s+$/g,'') != '';
+}
+
 function addBookmark(event) {
+	event.preventDefault();
 	url = $('#add_url').val();
+	//If trim is empty
+	if(! acceptUrl(url) ) {
+		return;
+	}
+	
 	$('#add_url').val('');
-	bookmark = { url: url, description:'', title:''};
+	bookmark = { url: url, description:'', title:'', from_own: '1'};
 	$.ajax({
 		type: 'POST',
 		url: OC.filePath('bookmarks', 'ajax', 'editBookmark.php'),
@ -200,8 +181,11 @@ function addBookmark(event) {
 		success: function(data){
 			if (data.status == 'success') {
 				bookmark.id = data.id;
+				bookmark.title = data.title
 				bookmark.added_date = new Date();
 				updateBookmarksList(bookmark, 'prepend');
+				checkEmpty();
+				watchUrlField();
 			}
 		}
 	});
@ -216,14 +200,19 @@ function delBookmark(event) {
 		success: function(data){
 			if (data.status == 'success') {
 				record.remove();
-				if($('.bookmarks_list').is(':empty')) {
-					$("#firstrun").show();
-				}
+				checkEmpty();
 			}
 		}
 	});
 }

+function checkEmpty() {
+	if($('.bookmarks_list').is(':empty')) {
+		$("#firstrun").show();
+	} else {
+		$("#firstrun").hide();
+	}
+}
 function editBookmark(event) {
 	if($('.bookmark_single_form').length){
 		$('.bookmark_single_form .reset').click();
@ -286,35 +275,22 @@ function updateBookmarksList(bookmark, position) {
 		bookmark.added_date.setTime(parseInt(bookmark.added)*1000);
 	}
 	
-	if(bookmark_view == 'image') { //View in images
-		service_url = formatString(shot_provider, {url: encodeEntities(bookmark.url), title: bookmark.title, width: 200});
-		bookmark['service_url'] = service_url;
-		html = tmpl("img_item_tmpl", bookmark);
+	html = tmpl("item_tmpl", bookmark);
+	if(position == "prepend") {
+		$('.bookmarks_list').prepend(html);
+	} else {
 		$('.bookmarks_list').append(html);
-		$('div[data-id="'+ bookmark.id +'"]').data('record', bookmark);
-		if(taglist != '') {
-			$('div[data-id="'+ bookmark.id +'"]').append('<p class="bookmark_tags">' + taglist + '</p>');
-		}
-		$('div[data-id="'+ bookmark.id +'"] a.bookmark_tag').bind('click', addFilterTag);
 	}
-	else {
-		html = tmpl("item_tmpl", bookmark);
-		if(position == "prepend") {
-			$('.bookmarks_list').prepend(html);
-		} else {
-			$('.bookmarks_list').append(html);
-		}
-		line = $('div[data-id="'+ bookmark.id +'"]');
-		line.data('record', bookmark);
-		if(taglist != '') {
-			line.append('<p class="bookmark_tags">' + taglist + '</p>');
-		}
-		line.find('a.bookmark_tag').bind('click', addFilterTag);
-		line.find('.bookmark_link').click(recordClick);
-		line.find('.bookmark_delete').click(delBookmark);
-		line.find('.bookmark_edit').click(editBookmark);
+	line = $('div[data-id="'+ bookmark.id +'"]');
+	line.data('record', bookmark);
+	if(taglist != '') {
+		line.append('<p class="bookmark_tags">' + taglist + '</p>');
 	}
-
+	line.find('a.bookmark_tag').bind('click', addFilterTag);
+	line.find('.bookmark_link').click(recordClick);
+	line.find('.bookmark_delete').click(delBookmark);
+	line.find('.bookmark_edit').click(editBookmark);
+	
 }

 function updateOnBottom() {
@ -332,7 +308,7 @@ function recordClick(event) {
 	$.ajax({
 		type: 'POST',
 		url: OC.filePath('bookmarks', 'ajax', 'recordClick.php'),
-		data: 'url=' + encodeURIComponent($(this).attr('href')),
+		data: 'url=' + encodeURIComponent($(this).attr('href'))
 	});
 }

--- a/l10n/ar.php
+++ b/l10n/ar.php
@ -5,7 +5,6 @@
 "Delete" => "حذف",
 "Cancel" => "الغاء",
 "Address" => "عنوان",
-"List" => "قائمة",
 "Settings" => "تعديلات",
 "Export" => "تصدير المعلومات",
 "Import" => "إدخال"
--- a/l10n/bg_BG.php
+++ b/l10n/bg_BG.php
@ -5,7 +5,6 @@
 "Delete" => "Изтриване",
 "Cancel" => "Отказ",
 "Address" => "Адрес",
-"List" => "Списък",
 "You have no bookmarks" => "Нямате отметки",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Завлачете това в лентата с отметки на браузъра си и го натискайте, когато искате да отметнете бързо някоя страница:",
 "Read later" => "Отмятане",
--- a/l10n/ca.php
+++ b/l10n/ca.php
@ -19,15 +19,13 @@
 "Cancel" => "Cancel·la",
 "Address" => "Adreça",
 "Add bookmark" => "Afegeix una adreça d'interès",
-"List" => "Llista",
-"Image" => "Imatge",
-"Hide" => "Amaga",
-"Show" => "Mostra",
 "Related Tags" => "Etiquetes relacionades",
 "Settings" => "Configuració",
 "You have no bookmarks" => "No teniu adreces d'interès",
+"Bookmarklet" => "Bookmarklet",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arrossegueu-ho al navegador i feu-hi un clic quan volgueu marcar ràpidament una adreça d'interès:",
 "Read later" => "Llegeix més tard",
+"Export & Import" => "Exporta i importa",
 "Export" => "Exporta",
 "Import" => "Importa"
 );
--- a/l10n/cs_CZ.php
+++ b/l10n/cs_CZ.php
@ -19,15 +19,13 @@
 "Cancel" => "Zrušit",
 "Address" => "Adresa",
 "Add bookmark" => "Přidat záložku",
-"List" => "Seznam",
-"Image" => "Obrázek",
-"Hide" => "Skrýt",
-"Show" => "Zobrazit",
 "Related Tags" => "Podobné značky",
 "Settings" => "Nastavení",
 "You have no bookmarks" => "Nemáte žádné záložky",
+"Bookmarklet" => "Rutina pro záložky",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Přetáhněte do Vašeho prohlížeče a klikněte, pokud si přejete rychle uložit stránku do záložek:",
 "Read later" => "Přečíst později",
+"Export & Import" => "Import a export",
 "Export" => "Exportovat",
 "Import" => "Importovat"
 );
--- a/l10n/da.php
+++ b/l10n/da.php
@ -16,10 +16,6 @@
 "Cancel" => "Annuller",
 "Address" => "Adresser",
 "Add bookmark" => "Tilføj bogmærke",
-"List" => "Liste",
-"Image" => "Billede",
-"Hide" => "Gem",
-"Show" => "Vis",
 "Related Tags" => "Relaterede Tags",
 "Settings" => "Indstillinger",
 "You have no bookmarks" => "Du har ingen bogmærker",
--- a/l10n/de.php
+++ b/l10n/de.php
@ -19,15 +19,13 @@
 "Cancel" => "Abbrechen",
 "Address" => "Adresse",
 "Add bookmark" => "Lesezeichen hinzufügen",
-"List" => "Liste",
-"Image" => "Bild",
-"Hide" => "Ausblenden",
-"Show" => "Anzeigen",
 "Related Tags" => "Verwandte Schlagworte",
 "Settings" => "Einstellungen",
 "You have no bookmarks" => "Du hast keine Lesezeichen",
+"Bookmarklet" => "Bookmarklet",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ziehe dies zu Deinen Browser-Lesezeichen und klicke darauf, wenn Du eine Website schnell den Lesezeichen hinzufügen willst.",
 "Read later" => "Später lesen",
+"Export & Import" => "Export & Import",
 "Export" => "Exportieren",
 "Import" => "Importieren"
 );
--- a/l10n/de_DE.php
+++ b/l10n/de_DE.php
@ -19,15 +19,13 @@
 "Cancel" => "Abbrechen",
 "Address" => "Adresse",
 "Add bookmark" => "Lesezeichen hinzufügen",
-"List" => "Liste",
-"Image" => "Bild",
-"Hide" => "Ausblenden",
-"Show" => "Anzeigen",
 "Related Tags" => "Verwandte Schlagworte",
 "Settings" => "Einstellungen",
 "You have no bookmarks" => "Sie haben keine Lesezeichen",
+"Bookmarklet" => "Bookmarklet",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ziehen Sie dies zu Ihren Browser-Lesezeichen und klicken Sie darauf, wenn Sie eine Website schnell den Lesezeichen hinzufügen wollen.",
 "Read later" => "Später lesen",
+"Export & Import" => "Export & Import",
 "Export" => "Exportieren",
 "Import" => "Importieren"
 );
--- a/l10n/el.php
+++ b/l10n/el.php
@ -16,10 +16,6 @@
 "Cancel" => "Ακύρωση",
 "Address" => "Διεύθυνση",
 "Add bookmark" => "Προσθήκη σελιδοδείκτη",
-"List" => "Λίστα",
-"Image" => "Εικόνα",
-"Hide" => "Απόκρυψη",
-"Show" => "Εμφάνιση",
 "Related Tags" => "Σχετικές ετικέτες",
 "Settings" => "Ρυθμίσεις",
 "You have no bookmarks" => "Δεν έχετε σελιδοδείκτες",
--- a/l10n/eo.php
+++ b/l10n/eo.php
@ -16,10 +16,6 @@
 "Cancel" => "Nuligi",
 "Address" => "Adreso",
 "Add bookmark" => "Aldoni legosignon",
-"List" => "Listo",
-"Image" => "Bildo",
-"Hide" => "Malmontri",
-"Show" => "Montri",
 "Related Tags" => "Rilataj etikedoj",
 "Settings" => "Agordo",
 "You have no bookmarks" => "Vi havas neniun legosignon",
--- a/l10n/es.php
+++ b/l10n/es.php
@ -19,10 +19,6 @@
 "Cancel" => "Cancelar",
 "Address" => "Dirección",
 "Add bookmark" => "Agregar Marcador",
-"List" => "Lista",
-"Image" => "Imagen",
-"Hide" => "Ocultar",
-"Show" => "Mostrar",
 "Related Tags" => "Tags relacionados",
 "Settings" => "Ajustes",
 "You have no bookmarks" => "No tienes marcadores",
--- a/l10n/es_AR.php
+++ b/l10n/es_AR.php
@ -19,10 +19,6 @@
 "Cancel" => "Cancelar",
 "Address" => "Dirección",
 "Add bookmark" => "Agregar marcador",
-"List" => "Lista",
-"Image" => "Imagen",
-"Hide" => "Ocultar",
-"Show" => "Mostrar",
 "Related Tags" => "Etiquetas relacionadas",
 "Settings" => "Configuración",
 "You have no bookmarks" => "No tenés marcadores",
--- a/l10n/et_EE.php
+++ b/l10n/et_EE.php
@ -16,10 +16,6 @@
 "Cancel" => "Loobu",
 "Address" => "Aadress",
 "Add bookmark" => "Lisa järjehoidja",
-"List" => "Nimekiri",
-"Image" => "Pilt",
-"Hide" => "Peida",
-"Show" => "Näita",
 "Related Tags" => "Seotud sildid",
 "Settings" => "Seaded",
 "You have no bookmarks" => "Sul pole järjehoidjaid",
--- a/l10n/eu.php
+++ b/l10n/eu.php
@ -16,10 +16,6 @@
 "Cancel" => "Ezeztatu",
 "Address" => "Helbidea",
 "Add bookmark" => "Gehitu laster-marka",
-"List" => "Zerrenda",
-"Image" => "Irudia",
-"Hide" => "Ezkutatu",
-"Show" => "Bistaratu",
 "Related Tags" => "Erlazionatutako etiketak",
 "Settings" => "Ezarpenak",
 "You have no bookmarks" => "Ez duzu laster-markarik",
--- a/l10n/fa.php
+++ b/l10n/fa.php
@ -8,7 +8,6 @@
 "Delete" => "حذف",
 "Cancel" => "منصرف شدن",
 "Address" => "آدرس",
-"List" => "فهرست",
 "Settings" => "تنظیمات",
 "You have no bookmarks" => "شما هیچ نشانکی ندارید",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "هنگامی که می‌خواهید کی صفحه‌ی اینترنتی را بسرعت نشان کنید، این را به نشانه‌های مرورگر خود بکشید و روی آن کلیک کنید.",
--- a/l10n/fi_FI.php
+++ b/l10n/fi_FI.php
@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Tuonti ei tue kyseistä tiedostotyyppiä",
 "Bookmarks" => "Kirjanmerkit",
 "Tags" => "Tunnisteet",
 "Edit bookmark" => "Muokkaa kirjanmerkkejä",
 "Are you sure you want to remove this tag from every entry?" => "Haluatko varmasti poistaa tämän tunnisteen jokaiselta kohteelta?",
 "Warning" => "Varoitus",
+"Import completed successfully." => "Tuonti valmistui onnistuneesti.",
+"Uploading..." => "Lähetetään...",
 "Bookm." => "Kirjanm.",
 "Add a bookmark" => "Lisää kirjanmerkki",
 "Close" => "Sulje",
@ -11,20 +14,18 @@
 "The address of the page" => "Sivun osoite",
 "Description of the page" => "Sivun kuvaus",
 "Save" => "Tallenna",
-"Edit" => "Muokkaa",
 "Delete" => "Poista",
+"Edit" => "Muokkaa",
 "Cancel" => "Peru",
 "Address" => "Osoite",
 "Add bookmark" => "Lisää kirjanmerkki",
-"List" => "Lista",
-"Image" => "Kuva",
-"Hide" => "Piilota",
-"Show" => "Näytä",
 "Related Tags" => "Vastaavanlaiset tunnisteet",
 "Settings" => "Asetukset",
 "You have no bookmarks" => "Sinulla ei ole kirjanmerkkejä",
+"Bookmarklet" => "Kirjanmerkitsin",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Vedä tämä selaimesi kirjanmerkkipalkkiin ja napsauta sitä, kun haluat lisätä kirjanmerkin nopeasti:",
 "Read later" => "Lue myöhemmin",
+"Export & Import" => "Vienti ja tuonti",
 "Export" => "Vie",
 "Import" => "Tuo"
 );
--- a/l10n/fr.php
+++ b/l10n/fr.php
@ -19,10 +19,6 @@
 "Cancel" => "Annuler",
 "Address" => "Adresse",
 "Add bookmark" => "Ajouter le favori",
-"List" => "Lister",
-"Image" => "Image",
-"Hide" => "Masquer",
-"Show" => "Afficher",
 "Related Tags" => "Étiquettes similaires",
 "Settings" => "Paramètres",
 "You have no bookmarks" => "Vous n'avez aucun favori",
--- a/l10n/gl.php
+++ b/l10n/gl.php
@ -9,7 +9,6 @@
 "Delete" => "Eliminar",
 "Cancel" => "Cancelar",
 "Address" => "Enderezo",
-"List" => "Lista",
 "Settings" => "Preferencias",
 "You have no bookmarks" => "Non ten marcadores",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arrastre esto aos marcadores do seu navegador e pulse nel cando queira marcar unha páxina con rapidez:",
--- a/l10n/he.php
+++ b/l10n/he.php
@ -7,7 +7,6 @@
 "Delete" => "מחיקה",
 "Cancel" => "ביטול",
 "Address" => "כתובת",
-"List" => "רשימה",
 "Settings" => "הגדרות",
 "You have no bookmarks" => "אין ברשותך סימניות",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "ניתן לגרור את הקישור הזה אל סרגל הסימניות בדפדפן שלך וללחוץ עליו כאשר מעוניינים ליצור סימניה לאתר במהירות.",
--- a/l10n/hr.php
+++ b/l10n/hr.php
@ -6,7 +6,6 @@
 "Delete" => "Obriši",
 "Cancel" => "Odustani",
 "Address" => "Adresa",
-"List" => "Lista",
 "Settings" => "Postavke",
 "Export" => "Izvoz",
 "Import" => "Uvezi"
--- a/l10n/hu_HU.php
+++ b/l10n/hu_HU.php
@ -8,7 +8,6 @@
 "Delete" => "Törlés",
 "Cancel" => "Mégsem",
 "Address" => "Cím",
-"List" => "Lista",
 "Settings" => "Beállítások",
 "You have no bookmarks" => "Nincsenek könyvjelzőid",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Húzd át ezt a böngésződben a Könyvjelzők sávba! Klikkelj rá bármikor, amikor szeretnéd az aktuális weboldal címét ide elmenteni!",
--- a/l10n/ia.php
+++ b/l10n/ia.php
@ -5,7 +5,6 @@
 "Delete" => "Deler",
 "Cancel" => "Cancellar",
 "Address" => "Adresse",
-"List" => "Lista",
 "Settings" => "Configurationes",
 "Export" => "Exportar",
 "Import" => "Importar"
--- a/l10n/id.php
+++ b/l10n/id.php
@ -8,10 +8,6 @@
 "Delete" => "hapus",
 "Cancel" => "batal",
 "Address" => "alamat",
-"List" => "daftar",
-"Image" => "gambar",
-"Hide" => "sembunyikan",
-"Show" => "tampilkan",
 "Related Tags" => "label terkait",
 "Settings" => "pengaturan",
 "Read later" => "baca nanti",
--- a/l10n/it.php
+++ b/l10n/it.php
@ -19,15 +19,13 @@
 "Cancel" => "Annulla",
 "Address" => "Indirizzo",
 "Add bookmark" => "Aggiungi segnalibro",
-"List" => "Elenco",
-"Image" => "Immagine",
-"Hide" => "Nascondi",
-"Show" => "Mostra",
 "Related Tags" => "Tag correlati",
 "Settings" => "Impostazioni",
 "You have no bookmarks" => "Non hai segnalibri",
+"Bookmarklet" => "Bookmarklet",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Quando vuoi creare rapidamente un segnalibro, trascinalo sui segnalibri del browser e fai clic su di esso:",
 "Read later" => "Leggi dopo",
+"Export & Import" => "Esporta e importa",
 "Export" => "Esporta",
 "Import" => "Importa"
 );
--- a/l10n/ja_JP.php
+++ b/l10n/ja_JP.php
@ -16,10 +16,6 @@
 "Cancel" => "キャンセル",
 "Address" => "アドレス",
 "Add bookmark" => "ブックマークを追加",
-"List" => "一覧",
-"Image" => "画像",
-"Hide" => "非表示",
-"Show" => "表示",
 "Related Tags" => "関連タグ",
 "Settings" => "設定",
 "You have no bookmarks" => "ブックマークがありません",
--- a/l10n/ka_GE.php
+++ b/l10n/ka_GE.php
@ -16,10 +16,6 @@
 "Cancel" => "უარყოფა",
 "Address" => "მისამართი",
 "Add bookmark" => "ბუქმარქის დამატება",
-"List" => "სია",
-"Image" => "სურათი",
-"Hide" => "დამალვა",
-"Show" => "გამოჩენა",
 "Related Tags" => "Related Tags",
 "Settings" => "პარამეტრები",
 "You have no bookmarks" => "თქვენ არ გაქვთ ბუქმარკები",
--- a/l10n/ko.php
+++ b/l10n/ko.php
@ -6,7 +6,6 @@
 "Delete" => "삭제",
 "Cancel" => "취소",
 "Address" => "주소",
-"List" => "목록",
 "Settings" => "설정",
 "Export" => "내보내기",
 "Import" => "가져오기"
--- a/l10n/lb.php
+++ b/l10n/lb.php
@ -6,7 +6,6 @@
 "Delete" => "Läschen",
 "Cancel" => "Ofbriechen",
 "Address" => "Adress",
-"List" => "Lescht",
 "Settings" => "Astellungen",
 "Export" => "Export",
 "Import" => "Import"
--- a/l10n/lt_LT.php
+++ b/l10n/lt_LT.php
@ -7,7 +7,6 @@
 "Delete" => "Ištrinti",
 "Cancel" => "Atšaukti",
 "Address" => "Adresas",
-"List" => "Sąrašas",
 "Settings" => "Nustatymai",
 "Export" => "Eksportuoti",
 "Import" => "Importuoti"
--- a/l10n/mk.php
+++ b/l10n/mk.php
@ -6,7 +6,6 @@
 "Delete" => "Избриши",
 "Cancel" => "Откажи",
 "Address" => "Адреса",
-"List" => "Листа",
 "Settings" => "Параметри",
 "Export" => "Извези",
 "Import" => "Внеси"
--- a/l10n/ms_MY.php
+++ b/l10n/ms_MY.php
@ -7,7 +7,6 @@
 "Delete" => "Padam",
 "Cancel" => "Batal",
 "Address" => "Alamat",
-"List" => "Senarai",
 "Settings" => "Tetapan",
 "Export" => "Export",
 "Import" => "Import"
--- a/l10n/nb_NO.php
+++ b/l10n/nb_NO.php
@ -16,10 +16,6 @@
 "Cancel" => "Avbryt",
 "Address" => "Adresse",
 "Add bookmark" => "Legg til bokmerke",
-"List" => "Liste",
-"Image" => "Bilde",
-"Hide" => "Skjul",
-"Show" => "Vis",
 "Related Tags" => "Relaterte tagger",
 "Settings" => "Innstillinger",
 "You have no bookmarks" => "Du har ingen bokmerker",
--- a/l10n/nl.php
+++ b/l10n/nl.php
@ -16,10 +16,6 @@
 "Cancel" => "Annuleer",
 "Address" => "Adres",
 "Add bookmark" => "Bladwijzer toevoegen",
-"List" => "Lijst",
-"Image" => "Afbeelding",
-"Hide" => "Verbergen",
-"Show" => "Tonen",
 "Related Tags" => "Aanverwante tags",
 "Settings" => "Instellingen",
 "You have no bookmarks" => "U heeft geen bladwijzers",
--- a/l10n/nn_NO.php
+++ b/l10n/nn_NO.php
@ -5,7 +5,6 @@
 "Delete" => "Slett",
 "Cancel" => "Kanseller",
 "Address" => "Adresse",
-"List" => "Liste",
 "Settings" => "Innstillingar",
 "Export" => "Eksporter",
 "Import" => "Importer"
--- a/l10n/oc.php
+++ b/l10n/oc.php
@ -4,7 +4,6 @@
 "Edit" => "Editar",
 "Delete" => "Escafa",
 "Cancel" => "Annula",
-"List" => "Tièra",
 "Settings" => "Configuracion",
 "Export" => "Exporta",
 "Import" => "Importa"
--- a/l10n/pl.php
+++ b/l10n/pl.php
@ -16,10 +16,6 @@
 "Cancel" => "Anuluj",
 "Address" => "Adres",
 "Add bookmark" => "Dodaj zakładkę",
-"List" => "Lista",
-"Image" => "Obraz",
-"Hide" => "Schowaj",
-"Show" => "Pokaż",
 "Related Tags" => "Powiązane Tagi",
 "Settings" => "Ustawienia",
 "You have no bookmarks" => "Nie masz żadnych zakładek",
--- a/l10n/pt_BR.php
+++ b/l10n/pt_BR.php
@ -19,10 +19,6 @@
 "Cancel" => "Cancelar",
 "Address" => "Endereço",
 "Add bookmark" => "Adicionar bookmark",
-"List" => "Listar",
-"Image" => "Imagem",
-"Hide" => "Ocultar",
-"Show" => "Exibir",
 "Related Tags" => "Tags relacionadas",
 "Settings" => "Ajustes",
 "You have no bookmarks" => "Você não tem marcadores",
--- a/l10n/pt_PT.php
+++ b/l10n/pt_PT.php
@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Tipo de ficheiro não suportado para importação",
 "Bookmarks" => "Marcadores",
 "Tags" => "Etiquetas",
 "Edit bookmark" => "Editar marcador",
 "Are you sure you want to remove this tag from every entry?" => "Tem a certeza de que quer remover esta etiqueta de cada registo?",
 "Warning" => "Aviso",
+"Import completed successfully." => "Importação bem sucedida.",
+"Uploading..." => "A enviar...",
 "Bookm." => "Marc.",
 "Add a bookmark" => "Acrescentar um marcador",
 "Close" => "Fechar",
@ -16,15 +19,13 @@
 "Cancel" => "Cancelar",
 "Address" => "Endereço",
 "Add bookmark" => "Acrescentar marcador",
-"List" => "Lista",
-"Image" => "Imagem",
-"Hide" => "Esconder",
-"Show" => "Mostrar",
 "Related Tags" => "Etiquetas relacionadas",
 "Settings" => "Configurações",
 "You have no bookmarks" => "Não tem marcadores",
+"Bookmarklet" => "Marcadorzinho",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arraste isto para o seu navegador, e click nele quando quiser guardar a página rapidamente com um marcador.",
 "Read later" => "Ler mais tarde",
+"Export & Import" => "Exportar & Importar",
 "Export" => "Exportar",
 "Import" => "Importar"
 );
--- a/l10n/ro.php
+++ b/l10n/ro.php
@ -9,7 +9,6 @@
 "Delete" => "Șterge",
 "Cancel" => "Anulare",
 "Address" => "Adresă",
-"List" => "Listă",
 "Settings" => "Setări",
 "You have no bookmarks" => "Nu ai nici un semn de carte",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Trage acest semn în semnele de carte din navigatorul tău web când dorești să salvezi rapid un semn către o pagină web:",
--- a/l10n/ru.php
+++ b/l10n/ru.php
@ -16,10 +16,6 @@
 "Cancel" => "Отменить",
 "Address" => "Адрес",
 "Add bookmark" => "Добавить закладку",
-"List" => "Список",
-"Image" => "Изображение",
-"Hide" => "Спрятать",
-"Show" => "Показать",
 "Related Tags" => "Связанные теги",
 "Settings" => "Конфигурация",
 "You have no bookmarks" => "У вас нет закладок",
--- a/l10n/ru_RU.php
+++ b/l10n/ru_RU.php
@ -14,20 +14,18 @@
 "The address of the page" => "Адрес страницы",
 "Description of the page" => "Описание страницы",
 "Save" => "Сохранить",
-"Edit" => "Редактировать",
 "Delete" => "Удалить",
+"Edit" => "Редактировать",
 "Cancel" => "Отмена",
 "Address" => "Адрес",
 "Add bookmark" => "Добавить закладку",
-"List" => "Список",
-"Image" => "Изображение",
-"Hide" => "Скрыть",
-"Show" => "Показать",
 "Related Tags" => "Связанные теги",
 "Settings" => "Настройки",
 "You have no bookmarks" => "У Вас нет закладок",
+"Bookmarklet" => "Bookmarklet",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Перетащите это в закладки Вашего браузера и кликните на него, когда захотите быстро добавить страницу в закладки:",
 "Read later" => "Прочитать позже",
+"Export & Import" => "Экспорт & Импорт",
 "Export" => "Экспортировать",
 "Import" => "Импортировать"
 );
--- a/l10n/si_LK.php
+++ b/l10n/si_LK.php
@ -14,20 +14,17 @@
 "The address of the page" => "පිටුවේ ලිපිනය",
 "Description of the page" => "පිටුවේ විස්තර",
 "Save" => "සුරකින්න",
-"Edit" => "සකසන්න",
 "Delete" => "මකන්න",
+"Edit" => "සකසන්න",
 "Cancel" => "එපා",
 "Address" => "ලිපිනය",
 "Add bookmark" => "පිටුසන එකතුකරන්න",
-"List" => "ලයිස්තුව",
-"Image" => "පින්තූරය",
-"Hide" => "සඟවන්න",
-"Show" => "පෙන්වන්න",
 "Related Tags" => "අදාළ ටැගයන්",
 "Settings" => "සිටුවම්",
 "You have no bookmarks" => "පිටු සළකුනු නොමැත",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "මෙම වෙබ් පිටුව ඉක්මනින් පිටු සළකුනක් ලෙස සටහන් කිරීමට, එය බ්‍රවුසරයේ පිටු සළකුනු මතට ඇද ක්ලික් කරන්න:",
 "Read later" => "පසුව කියවීමට",
+"Export & Import" => "ආයාත හා නිර්යාත",
 "Export" => "නිර්යාත කරන්න",
 "Import" => "ආයාත කරන්න"
 );
--- a/l10n/sk_SK.php
+++ b/l10n/sk_SK.php
@ -19,10 +19,6 @@
 "Cancel" => "Zrušiť",
 "Address" => "Adresa",
 "Add bookmark" => "Pridať záložku",
-"List" => "Zoznam",
-"Image" => "Obrázok",
-"Hide" => "Skyť",
-"Show" => "Zobraziť",
 "Related Tags" => "Podobné značky",
 "Settings" => "Nastavenia",
 "You have no bookmarks" => "Nemáte záložky",
--- a/l10n/sl.php
+++ b/l10n/sl.php
@ -16,10 +16,6 @@
 "Cancel" => "Prekliči",
 "Address" => "Naslov",
 "Add bookmark" => "Dodaj zaznamek",
-"List" => "znam",
-"Image" => "Slika",
-"Hide" => "Skrij",
-"Show" => "Pokaži",
 "Related Tags" => "Sorodne oznake",
 "Settings" => "Nastavitve",
 "You have no bookmarks" => "Nimate zaznamkov",
--- a/l10n/sr.php
+++ b/l10n/sr.php
@ -5,6 +5,5 @@
 "Delete" => "Обриши",
 "Cancel" => "Откажи",
 "Address" => "Адреса",
-"List" => "Списак",
 "Settings" => "Подешавања"
 );
--- a/l10n/sr@latin.php
+++ b/l10n/sr@latin.php
@ -5,6 +5,5 @@
 "Delete" => "Obriši",
 "Cancel" => "Otkaži",
 "Address" => "Adresa",
-"List" => "Spisak",
 "Settings" => "Podešavanja"
 );
--- a/l10n/sv.php
+++ b/l10n/sv.php
@ -19,10 +19,6 @@
 "Cancel" => "Avbryt",
 "Address" => "Adress",
 "Add bookmark" => "Lägg till bokmärke",
-"List" => "Lista",
-"Image" => "Bild",
-"Hide" => "Göm",
-"Show" => "Visa",
 "Related Tags" => "Relaterade taggar",
 "Settings" => "Inställningar",
 "You have no bookmarks" => "Du har inga bokmärken",
--- a/l10n/ta_LK.php
+++ b/l10n/ta_LK.php
@ -6,7 +6,6 @@
 "Edit" => "தொகுக்க",
 "Delete" => "அழிக்க",
 "Cancel" => "இரத்து செய்க",
-"List" => "பட்டியல்",
 "Settings" => "அமைப்புகள்",
 "Export" => "ஏற்றுமதி",
 "Import" => "இறக்குமதி"
--- a/l10n/th_TH.php
+++ b/l10n/th_TH.php
@ -16,10 +16,6 @@
 "Cancel" => "ยกเลิก",
 "Address" => "ที่อยู่",
 "Add bookmark" => "เพิ่มรายการโปรด",
-"List" => "รายการ",
-"Image" => "รูปภาพ",
-"Hide" => "ซ๋อน",
-"Show" => "แสดง",
 "Related Tags" => "ป้ายกำกับอื่นๆที่เกี่ยวข้อง",
 "Settings" => "ตั้งค่า",
 "You have no bookmarks" => "คุณยังไม่มีรายการโปรด",
--- a/l10n/tr.php
+++ b/l10n/tr.php
@ -8,9 +8,6 @@
 "Delete" => "Sil",
 "Cancel" => "İptal",
 "Address" => "Adres",
-"List" => "Liste",
-"Hide" => "Gizle",
-"Show" => "Göster",
 "Settings" => "Ayarlar",
 "Read later" => "Sonra oku",
 "Export" => "Dışa aktar",
--- a/l10n/uk.php
+++ b/l10n/uk.php
@ -7,7 +7,6 @@
 "Delete" => "Видалити",
 "Cancel" => "Відмінити",
 "Address" => "Адреса",
-"List" => "Список",
 "Settings" => "Налаштування",
 "You have no bookmarks" => "У вас нема закладок",
 "Read later" => "Прочитати пізніше",
--- a/l10n/vi.php
+++ b/l10n/vi.php
@ -7,7 +7,6 @@
 "Delete" => "Xóa",
 "Cancel" => "Hủy",
 "Address" => "Địa chỉ",
-"List" => "Danh sách",
 "Settings" => "Tùy chỉnh",
 "You have no bookmarks" => "Bạn chưa có đánh dấu nào",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Kéo vào bookmark trình duyệt của bạn và nhấp vào nó, khi bạn muốn đánh dấu một trang web một cách nhanh chóng:",
--- a/l10n/zh_CN.GB2312.php
+++ b/l10n/zh_CN.GB2312.php
@ -16,10 +16,6 @@
 "Cancel" => "取消",
 "Address" => "网址",
 "Add bookmark" => "添加书签",
-"List" => "列表",
-"Image" => "图片",
-"Hide" => "隐藏",
-"Show" => "显示",
 "Related Tags" => "相关标签",
 "Settings" => "设置",
 "You have no bookmarks" => "您没有书签",
--- a/l10n/zh_CN.php
+++ b/l10n/zh_CN.php
@ -16,10 +16,6 @@
 "Cancel" => "取消",
 "Address" => "地址",
 "Add bookmark" => "新增书签",
-"List" => "列表",
-"Image" => "图像",
-"Hide" => "隐藏",
-"Show" => "显示",
 "Related Tags" => "相关标签",
 "Settings" => "设置",
 "You have no bookmarks" => "您暂无书签",
--- a/l10n/zh_TW.php
+++ b/l10n/zh_TW.php
@ -7,7 +7,6 @@
 "Delete" => "刪除",
 "Cancel" => "取消",
 "Address" => "網址",
-"List" => "清單",
 "Settings" => "設定",
 "You have no bookmarks" => "你沒有書籤",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "將此拖曳至您的瀏覽器書籤並點擊, 當你想要將網頁快速地加入書籤:",
--- a/templates/js_tpl.php
+++ b/templates/js_tpl.php
@ -1,10 +1,6 @@
 <script type="text/html" id="item_tmpl">
 		<div class="bookmark_single" data-id="<%= id %>">
 				<p class="bookmark_actions">
-					<span class="bookmark_edit">
-						<img class="svg" src="<?php echo OCP\image_path("", "actions/rename.svg");?>"
-							title="<?php echo $l->t('Edit');?>">
-					</span>
 					<span class="bookmark_delete">
 						<img class="svg" src="<?php echo OCP\image_path("", "actions/delete.svg");?>"
 							title="<?php echo $l->t('Delete');?>">
@ -17,8 +13,12 @@
 				</p>
 				<p class="bookmark_url">
 					<a href="<%= encodeEntities(url) %>" target="_blank" class="bookmark_link">
-						<%= encodeEntities(url) %>
+						<%= encodeEntities(title == '' ? '' : url) %>
 					</a>
+					<span class="bookmark_edit">
+						<img class="svg" src="<?php echo OCP\image_path("", "actions/rename.svg");?>"
+							title="<?php echo $l->t('Edit');?>">
+					</span>
 				</p>
 				<p class="bookmark_date"><%= formatDate(added_date) %></p>
 				<p class="bookmark_desc"><%= encodeEntities(description)%> </p>
@ -66,25 +66,4 @@
 		</p>
 		<em><%= nbr %></em>
 	</li>
-</script>
-<script type="text/html" id="img_item_tmpl">
-	<div class="bookmark_single" data-id="<%= id %>" >
-		<p class="shot"><img src="<%= service_url %>"></p>
-		<p class="bookmark_actions">
-			<span class="bookmark_edit">
-				<img class="svg" src="<?php echo OCP\image_path("", "actions/rename.svg");?>"
-							title="<?php echo $l->t('Edit');?>">
-			</span>
-			<span class="bookmark_delete">
-				<img class="svg" src="<?php echo OCP\image_path("", "actions/delete.svg");?>"
-					title="<?php echo $l->t('Delete');?>">
-			</span>&nbsp;
-		</p>
-		<p class="bookmark_title">
-			<a href="<%= encodeEntities(url)%>" target="_blank" class="bookmark_link"><%= encodeEntities(title)%></a>
-		</p>
-		<p class="bookmark_desc"><%= encodeEntities(description)%></p>
-		<p class="bookmark_url"><a href="<%= encodeEntities(url)%>" target="_blank"
-			class="bookmark_link"><%= encodeEntities(url)%></a></p>
-	</div>
 </script>
--- a/templates/list.php
+++ b/templates/list.php
@ -6,25 +6,25 @@
 * later.
 * See the COPYING-README file.
 */
+function bookmarklet(){
+	$l = new OC_l10n('bookmarks');
+	$blet = "javascript:(function(){var a=window,b=document,c=encodeURIComponent,e=document.title,d=a.open('";
+	$blet .= OCP\Util::linkToAbsolute('bookmarks', 'addBm.php');
+	$blet .= "?output=popup&url='+c(b.location)+'&title='+e,'bkmk_popup','left='+((a.screenX||a.screenLeft)+10)+',top='+((a.screenY||a.screenTop)+10)+',height=400px,width=550px,resizable=1,alwaysRaised=1');a.setTimeout(function(){d.focus()},300);})();";
+	$help_msg  = $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:');
+	return '<small>'.$help_msg.'</small><br /><a class="button bookmarklet" href="' . $blet . '">' . $l->t('Read later') . '</a>';
+}
 ?>
-<input type="hidden" id="bookmarkFilterTag" value="<?php echo $_['req_tag']; ?>" />
-<div id="controls">
-	<input type="text" id="add_url" value="" placeholder="<?php echo $l->t('Address'); ?>"/>
-	<input type="submit" value="<?php echo $l->t('Add bookmark'); ?>" id="bookmark_add_submit" />

-	<div id="view_type">
-		<input type="button" class="list" value="<?php echo $l->t('List')?>" />
-		<input type="button" class="image" style="display:none" value="<?php echo $l->t('Image')?>" />
-	</div>
-</div>
 <div id="leftcontent">
-	<div class="centercontent">
-		<span class="left_img"> <?php echo $l->t('Hide')?> &lt;&lt;</span>
-		<span class="right_img"> <?php echo $l->t('Show')?> &gt;&gt;</span>
-	</div>
+
+	<form id="add_form">
+		<input type="text" id="add_url" value="" placeholder="<?php echo $l->t('Address'); ?>"/>
+		<input type="submit" value="<?php echo $l->t('Add'); ?>" id="bookmark_add_submit" />
+	</form>

 	<p id="tag_filter">
-		<input type="text" placeholder="Filter By tag" value="<?php echo $_['req_tag']; ?>"/>
+		<input type="text" value="<?php echo $_['req_tag']; ?>"/>
 	</p>

 	<label><?php echo $l->t('Related Tags'); ?></label>
@ -32,7 +32,7 @@
 	</ul>


-<div id="bookmark_settings">
+<div id="bookmark_settings" class="">
 	<ul class="controls">
 		<li style="float: right">
 			<button id="settingsbtn" title="<?php echo $l->t('Settings'); ?>">
@ -47,23 +47,18 @@

 </div>
 <div id="rightcontent" class="rightcontent">
-	<div class="bookmarks_list"></div>
 	<div id="firstrun" style="display: none;">
 		<?php
 			echo $l->t('You have no bookmarks');
-			$embedded = true;/*
-			require_once OC_App::getAppPath('bookmarks') .'/templates/bookmarklet.php' ;
-			createBookmarklet(); */
-		?>
-	<div id="appsettings" class="popup bottomleft hidden"></div>
+			$embedded = true;
+			
+			echo bookmarklet();?><br/><br />
+
+			<small><a href="#" id="firstrun_setting"><?php echo $l->t('You can also try to import a bookmark file');?></a></small>
+	<div class="bookmarks_list"></div>
 </div>
 <script>
 	var fullTags = <?php echo $_['tags'];?>;
-	var init_view = '<?php echo OCP\Config::getUserValue(OCP\USER::getUser(), 'bookmarks', 'currentview', 'text');?>';
-	var init_sidebar = '<?php echo OCP\Config::getUserValue(OCP\USER::getUser(), 'bookmarks', 'sidebar', 'true');?>';
-	var shot_provider = '<?php echo OCP\Config::getUserValue(OCP\USER::getUser(),
-		'bookmarks', 'shot_provider', 'http://screenshots.bookmarkly.com/thumb?url={url}');?>';
-	//http://api.thumbalizr.com/?width={width}&url={url}
 </script>

 <script type="text/html" id="edit_dialog_tmpl">
--- a/templates/settings.php
+++ b/templates/settings.php
@ -9,15 +9,7 @@

 <fieldset class="personalblock">
 	<legend><strong><?php echo $l->t('Bookmarklet');?></strong></legend>
-	<small>
-		<?php echo $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:');?>
-	</small><br />
-	<a class="button bookmarklet"
-		href="javascript:(function(){var a=window,b=document,c=encodeURIComponent,e=document.title,d=a.open('<?php 
-		echo OCP\Util::linkToAbsolute('bookmarks', 'addBm.php');
-		?>'?output=popup&url=\'+c(b.location)+\'&title=\'+e,\'bkmk_popup\',\'left=\'+((a.screenX||a.screenLeft)+10)+\',top=\'+((a.screenY||a.screenTop)+10)+\',height=400px,width=550px,resizable=1,alwaysRaised=1\');a.setTimeout(function(){d.focus()},300);})();">
-		<?php echo $l->t('Read later');?>
-	</a>
+	<?php echo bookmarklet();?><br />
 </fieldset>

 <form id="import_bookmark" action="<?php echo OCP\Util::linkTo( "bookmarks", "ajax/import.php" );?>"
@ -30,7 +22,7 @@

 			<legend><strong><?php echo $l->t('Export & Import');?></strong></legend>
 			<input type="button" id="bm_export" href="<?php echo OCP\Util::linkTo('bookmarks', 'export.php') ;?>" value="<?php echo $l->t('Export'); ?>" />
-			<input type="file" id="bm_import" name="bm_import">
+			<input type="file" id="bm_import" name="bm_import" size="5">
 			<button type="button" name="bm_import_btn" id="bm_import_submit"><?php echo $l->t('Import'); ?></button>
 			<div id="upload"></div>