Merge branch 'master' into navigation

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) {

addBm.php

@@ -58,7 +58,7 @@ $bm = array('title'=> $title,
 );
 
 //Find All Tags
-$qtags = OC_Bookmarks_Bookmarks::findTags();
+$qtags = OC_Bookmarks_Bookmarks::findTags(array(), 0, 400);
 $tags = array();
 foreach($qtags as $tag) {
 	$tags[] = $tag['tag'];

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();
-}

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();

appinfo/app.php

@@ -7,8 +7,8 @@
 * See the COPYING-README file.
 */
 
-OC::$CLASSPATH['OC_Bookmarks_Bookmarks'] = 'apps/bookmarks/lib/bookmarks.php';
+OC::$CLASSPATH['OC_Bookmarks_Bookmarks'] = 'bookmarks/lib/bookmarks.php';
-OC::$CLASSPATH['OC_Search_Provider_Bookmarks'] = 'apps/bookmarks/lib/search.php';
+OC::$CLASSPATH['OC_Search_Provider_Bookmarks'] = 'bookmarks/lib/search.php';
 
 $l = new OC_l10n('bookmarks');
 OCP\App::addNavigationEntry( array( 'id' => 'bookmarks_index',

css/bookmarks.css

@@ -1,33 +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, #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; margin-bottom: 1.5em; }
+#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, input.disabled:focus {
+	cursor: not-allowed;
+	background-color: #ddd;
+	color: gray;
+}
 #leftcontent {
-/*     margin: 0; */
+	top: 4em !important;
-    padding-top: 1em;
-/*     top: 3.5em !important; */
 }
 
 #rightcontent {
-    padding-top: 5px;
+    	padding-top: 5px;
-    top: 3.5em !important;
+    	top: 1em !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;
-/* 	margin-right: 10px; */
-  padding: 3px;
-}
-
-.centercontent .right_img {
-	display:none;
 }
 
 .bookmarks_headline {
@@ -44,14 +33,18 @@
 
 .bookmarks_list {
 	overflow: auto;
-	position: fixed;
+	-moz-box-sizing: border-box;
-	top: 6.5em;
+	box-sizing: border-box;
-/* 	margin-left: 15px; */
+	padding-top: 3em;
-
+	width: 100%;
+	height: 100%;
 }
 
+#add_form {
+	padding-bottom: 2em;
+}
 #add_url {
-	width: 25em;
+	width: 12em;
 }
 .bookmarks_addBml {
 	text-decoration: underline;
@@ -70,16 +63,19 @@
 .bookmark_actions {
 	position: absolute;
 	right: 1em;
-	top: 0.7em;
+	bottom:1.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;
+	padding: 0.2em 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;
 }
@@ -92,10 +88,20 @@
 	display: block;
 }
 
+.bookmark_edit_btn {
+        position: absolute;
+        top: 0.6em;
+        left: 21%;
+}
+
 .bookmark_title {
-	font-weight: bold;
+        font-weight: bold;
-	display: inline-block;
+        display: inline-block;
-	margin-right: 0.8em;
+        margin-right: 0.8em;
+        width: 20%;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
 }
 
 .bm_view_list .bookmark_tags {
@@ -104,6 +110,11 @@
 	right: 6em;
 	text-align: right;
 }
+
+.bookmark_tags {
+        left:25%;
+        position: absolute;
+}
 .bookmark_tag {
 	display: inline-block;
 	color: white;
@@ -122,10 +133,10 @@
 
 .addBm {
 	background: none repeat scroll 0 0 #F8F8F8;
-  border-radius: 0.5em 0.5em 0.5em 0.5em;
+	border-radius: 0.5em 0.5em 0.5em 0.5em;
-  color: #555555;
+	color: #555555;
-  margin: 1em;
+	margin: 1em;
-  padding: 0.5em 1em;
+	padding: 0.5em 1em;
 	text-shadow: 0 1px 0 #FFFFFF;
 	width: 500px;
 	
@@ -136,7 +147,6 @@
 .addBm h1 {
 	font-weight: bold;
 	border-bottom: 1px solid #BABABA;
-
 }
 
 
@@ -156,11 +166,9 @@
 }
 .addBm textarea{
 	min-width:250px;
-/* 	min-height: 70px; */
 }
 .addBm .close_btn
 {
-/* 	background-color: #EEEEEE; */
 	height: 18px;
 	margin: -20px 0 0;
 	padding: 1px;
@@ -178,10 +186,6 @@
 
 }
 
-.ui-autocomplete {
-/* 	background: none repeat scroll 0 0 #DEE7F8; */
-}
-
 #leftcontent > ul > li, .leftcontent li {
 	padding: 0.2em;
 	padding-left:1em;
@@ -194,16 +198,14 @@
 }
 
 #leftcontent .tag_list > li .tag , #leftcontent .share_list > li .tag{
-		background: none repeat scroll 0 0 #DEE7F8;
+	background: none repeat scroll 0 0 #DEE7F8;
-    border: 1px solid #CAD8F3;
+	border: 1px solid #CAD8F3;
-    border-radius: 6px 6px 6px 6px;
+	border-radius: 6px 6px 6px 6px;
-    color: #555555;
+	color: #555555;
-    font-weight: normal;
+	font-weight: normal;
-		
+	float:left;
-/* 		padding: 0.2em 18px 0.2em 0.5em; */
+	padding: 0.3em;
-		float:left;
+    	position: relative;
-		padding: 0.3em;
-    position: relative;
 }
 
 ul.tagit li.tagit-new {
@@ -224,7 +226,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 {
@@ -234,70 +236,47 @@ li:hover em { display : none; }
 	padding:0;
 }
 #tag_filter ul.tagit li.tagit-choice {
-    background: none repeat scroll 0 0 #DEE7F8;
+	background: none repeat scroll 0 0 #DEE7F8;
-		padding: 0.2em 18px 0.2em 0.5em;
+	padding: 0.2em 18px 0.2em 0.5em;
-/* 		padding:0; */
 }
 
 #tag_filter a {
-    display: inline;
+	display: inline;
-    float: none;
+	float: none;
-    margin: 0;
+ 	margin: 0;
-    padding: 0;
+	padding: 0;
 }
 #tag_filter ul.tagit li.tagit-choice .close{
-		margin-top: -8px;
+	margin-top: -8px;
-		cursor: pointer;
+	cursor: pointer;
-    margin-top: -8px;
+    	margin-top: -8px;
-    position: absolute;
+    	position: absolute;
-    right: 0.1em;
+	right: 0.1em;
-    top: 50%;
+	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;
-
-/* 	background: none repeat scroll 0 0 #EEEEEE; */
-  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
 }
 
 .bookmark_desc{
 	height: 1.5em;
 	padding-left:1em;
 	white-space:nowrap;
-  text-overflow:ellipsis;
+	text-overflow:ellipsis;
-  overflow:hidden;
+	overflow:hidden;
-  display:block;
+	display:block;
+        float:left;
+        position: absolute;
+        left: 25%;
+        width:40%;
+        top: 0.7em;
+        font-weight:500;
 }
 .bookmark_date, .bookmark_submit {
 	font-size:small;
 	position: absolute;
-  right: 6em;
+	right: 6em;
 	color:gray;
 /* 	margin-top:2.5em; */
 	margin-right: 0.2em;
+        top:0.8em;
 }
 
 /*
@@ -323,32 +302,33 @@ 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;
+	bottom: 0.7em;
-    display: block;
+	display: block;
-    position: absolute;
+	position: absolute;
-    right: 1em;
+	right: 1em;
-		top: auto;
+	top: auto;
 }
 
 #bookmark_settings {
-    -moz-box-sizing: border-box;
+	-moz-box-sizing: border-box;
-    background: none repeat scroll 0 0 #EEEEEE;
+	background: none repeat scroll 0 0 #EEEEEE;
-    border-right: 1px solid #CCCCCC;
+	border-right: 1px solid #CCCCCC;
-    border-top: 1px solid #CCCCCC;
+	border-top: 1px solid #CCCCCC;
-    bottom: 0;
+ 	bottom: 0;
-    height: 2.8em;
+	height: 2.8em;
-    margin: 0;
+	margin: 0;
-    overflow: visible;
+	overflow: visible;
-    padding: 0;
+	padding: 0;
-    position: fixed;
+	position: fixed;
-    width: 20em;
+	width: 20em;
-    z-index: 2;
+	z-index: 2;
 }
+
 #leftcontent #bookmark_settings li{
 	padding: 0;
 	background-color:transparent;
@@ -358,16 +338,43 @@ li:hover em { display : none; }
 }
 
 #bookmark_settings .controls {
-    height: 100%;
+	height: 2.8em;
-    width: 100%;
+	width: 100%;
 }
 
 #bookmark_settings .controls > li:last-child button {
-    margin-right: 0.3em;
+	margin-right: 0.3em;
 }
-#bookmark_settings button {
+#bookmark_settings .controls button {
-    height: 2.4em;
+	height: 2.4em;
-    margin: 0.15em 0 0 0.15em;
+	margin: 0.15em 0 0 0.15em;
-    padding: 0.2em 0.1em 0;
+	padding: 0.2em 0.1em 0;
-    width: 2.4em;
+	width: 2.4em;
+}
+
+#bookmark_settings.open {
+	height: auto;
+}
+#bm_setting_panel {
+	background-color: #eee;
+	padding: 1em;
+	height: 100%;
+/* 	display:none; */
+}
+/* .open #bm_setting_panel { display:block; } */
+
+#bm_setting_panel legend{
+	margin-top: 0.5em;
+}
+
+#bm_import {
+	opacity: 0;
+	position: absolute;
+}
+#import_bookmark .personalblock {
+	margin-top: 1em;
+}
+#leftcontent a.bookmarklet {
+	margin-top: 5px;
+	padding: 0 5px 2px;
 }

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,19 +29,23 @@ 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');
 }
-
+$export_name = "owncloud-bookmarks-".date('Y-m-d').'.html';
 header("Cache-Control: private");
 header("Content-Type: application/stream");
 header("Content-Length: ".$fileSize);
-header("Content-Disposition: attachment; filename=oc-bookmarks.html");
+header("Content-Disposition: attachment; filename=".$export_name);
 
 echo $file;
 exit;

index.php

@@ -29,6 +29,7 @@ OCP\App::checkAppEnabled('bookmarks');
 
 OCP\App::setActiveNavigationEntry( 'bookmarks_index' );
 
+OCP\Util::addscript('bookmarks', 'settings');
 OCP\Util::addscript('bookmarks', 'bookmarks');
 OCP\Util::addStyle('bookmarks', 'bookmarks');
 OCP\Util::addscript('bookmarks', 'addBm');
@@ -37,7 +38,7 @@ OCP\Util::addscript('bookmarks', 'addBm');
 OCP\Util::addscript('bookmarks/3rdparty', 'tag-it');
 OCP\Util::addscript('bookmarks/3rdparty', 'js_tpl');
 OCP\Util::addStyle('bookmarks/3rdparty', 'jquery.tagit');
-$qtags = OC_Bookmarks_Bookmarks::findTags();
+$qtags = OC_Bookmarks_Bookmarks::findTags(array(), 0, 400);
 
 $tags = array();
 foreach($qtags as $tag) {

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);
+	watchUrlField();
-	$('#view_type input').click(clickSwitchView);
+	$('#bm_import').change(attachSettingEvent);
-	$('#bookmark_add_submit').click(addBookmark);
+	$('#add_url').on('keydown keyup change click', watchUrlField);
-  $('#settingsbtn').on('click keydown', function() {
+  $('#settingsbtn').on('click keydown', toggleSettings);
-		try {
+	$('#bm_export').click(exportBm);
-			OC.appSettings({appid:'bookmarks', loadJS:true, cache:false});
+	$('#firstrun_setting').click(function(){
-		} catch(e) {
+		if(! $('#bookmark_settings').hasClass('open')){
-			alert(e);
+			$('#settingsbtn').click();
 		}
 	});
-
+	$('.bookmarks_list').scroll(updateOnBottom).empty();
-	$(window).resize(function () {
-		fillWindow($('.bookmarks_list'));
-	});
-	$(window).resize();
-	$('.bookmarks_list').scroll(updateOnBottom).empty().width($('#rightcontent').width());
 	$('#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() {
+function watchClickInSetting(e){
-	$.post(OC.filePath('bookmarks', 'ajax', 'changescreen.php'), {sidebar: $('.right_img').is(':visible')});
+	if($('#bookmark_settings').find($(e.target)).length == 0){
-	toggleSideBar();
+		toggleSettings();
-}
-
-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 toggleSettings() {
-function clickSwitchView(){
+	if( $('#bookmark_settings').hasClass('open')) { //Close
-	$.post(OC.filePath('bookmarks', 'ajax', 'changescreen.php'), {view:bookmark_view});
+		$('#bookmark_settings').switchClass( "open", "" );
-	switchView();
+		$('body').unbind('click', watchClickInSetting);
-}
+	}
-
+	else {		
-function switchView(){
+		$('#bookmark_settings').switchClass( "", "open");
-	if(bookmark_view == 'list') { //Then switch to img
+		$('body').bind('click',watchClickInSetting);
-		$('.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';
 	}
-	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')) {
+				checkEmpty();
-					$("#firstrun").show();
-				}
 			}
 		}
 	});
 }
 
+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,34 +275,21 @@ function updateBookmarksList(bookmark, position) {
 		bookmark.added_date.setTime(parseInt(bookmark.added)*1000);
 	}
 	
-	if(bookmark_view == 'image') { //View in images
+	html = tmpl("item_tmpl", bookmark);
-		service_url = formatString(shot_provider, {url: encodeEntities(bookmark.url), title: bookmark.title, width: 200});
+	if(position == "prepend") {
-		bookmark['service_url'] = service_url;
+		$('.bookmarks_list').prepend(html);
-		html = tmpl("img_item_tmpl", bookmark);
+	} 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 {
+	line = $('div[data-id="'+ bookmark.id +'"]');
-		html = tmpl("item_tmpl", bookmark);
+	line.data('record', bookmark);
-		if(position == "prepend") {
+	if(taglist != '') {
-			$('.bookmarks_list').prepend(html);
+		line.append('<p class="bookmark_tags">' + taglist + '</p>');
-		} 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.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);
 	
 }
 
@@ -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'))
 	});
 }
 

js/settings.js

@@ -1,12 +1,12 @@
-$(document).ready(function() {
-	$('#bm_import_submit').click(attachSettingEvent);
-});
-
-
 function attachSettingEvent(event) {
 	event.preventDefault();
 	fileUpload($(this).closest('form'), $('#upload'));
 }
+
+function exportBm(e) {
+	window.location = $(this).attr('href');
+}
+
 function fileUpload(form, result_div) {
 		
 	var uploadEventHandler = function () {

l10n/ar.php

@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Close" => "إغلق",
 "Save" => "حفظ",
-"Edit" => "تعديل",
 "Delete" => "حذف",
+"Edit" => "تعديل",
 "Cancel" => "الغاء",
 "Address" => "عنوان",
-"List" => "قائمة",
+"Add" => "أدخل",
 "Settings" => "تعديلات",
-"Import" => "إدخال",
+"Export" => "تصدير المعلومات",
-"Export" => "تصدير المعلومات"
+"Import" => "إدخال"
 );

l10n/bg_BG.php

@@ -2,14 +2,13 @@
 "Bookmarks" => "Отметки",
 "Tags" => "Етикети",
 "Save" => "Запис",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Завлачете това в лентата с отметки на браузъра си и го натискайте, когато искате да отметнете бързо някоя страница:",
-"Read later" => "Отмятане",
 "Delete" => "Изтриване",
 "Cancel" => "Отказ",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Завлачете това в лентата с отметки на браузъра си и го натискайте, когато искате да отметнете бързо някоя страница:",
+"Read later" => "Отмятане",
 "Address" => "Адрес",
-"List" => "Списък",
+"Add" => "Добавяне",
 "You have no bookmarks" => "Нямате отметки",
-"Bookmarklet <br />" => "Бутон за отметки <br />",
+"Export" => "Изнасяне",
-"Import" => "Внасяне",
+"Import" => "Внасяне"
-"Export" => "Изнасяне"
 );

l10n/ca.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Importació d'un tipus de fitxer no implementat",
 "Bookmarks" => "Adreces d'interès",
 "Tags" => "Etiquetes",
+"Filter by tag" => "Filtrat per etiqueta",
 "Edit bookmark" => "Edita l'adreça d'interès",
 "Are you sure you want to remove this tag from every entry?" => "Segur que voleu eliminar aquesta etiqueta de cada entrada?",
 "Warning" => "Avís",
+"Import completed successfully." => "La importació ha acabat amb èxit",
+"Uploading..." => "Pujant...",
 "Bookm." => "Marcador",
 "Add a bookmark" => "Afegeix una adreça d'interès",
 "Close" => "Tanca",
@@ -11,23 +15,19 @@
 "The address of the page" => "L'adreça de la pàgina",
 "Description of the page" => "Descripció de la pàgina",
 "Save" => "Desa",
+"Delete" => "Esborra",
+"Edit" => "Edita",
+"Cancel" => "Cancel·la",
 "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",
-"Edit" => "Edita",
-"Delete" => "Esborra",
-"Cancel" => "Cancel·la",
 "Address" => "Adreça",
-"Add bookmark" => "Afegeix una adreça d'interès",
+"Add" => "Afegeix",
-"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 <br />" => "Bookmarklet <br />",
+"You can also try to import a bookmark file" => "També podeu intentar importar un fitxer d'adreces d'interès",
-"Import bookmarks" => "Importa les adreces d'interès",
+"Bookmarklet" => "Bookmarklet",
-"Import" => "Importa",
+"Export & Import" => "Exporta i importa",
-"Export bookmarks" => "Exporta adreces d'interès",
+"Export" => "Exporta",
-"Export" => "Exporta"
+"Import" => "Importa"
 );

l10n/cs_CZ.php

@@ -2,6 +2,7 @@
 "Unsupported file type for import" => "Nepodporovaný typ souboru pro import",
 "Bookmarks" => "Záložky",
 "Tags" => "Značky",
+"Filter by tag" => "Filtrovat podle značky",
 "Edit bookmark" => "Upravit záložku",
 "Are you sure you want to remove this tag from every entry?" => "Opravdu jste si jisti, že si přejete odstranit tuto značku z každého záznamu?",
 "Warning" => "Varování",
@@ -14,24 +15,19 @@
 "The address of the page" => "Adresa stránky",
 "Description of the page" => "Popis stránky",
 "Save" => "Uložit",
+"Delete" => "Smazat",
+"Edit" => "Upravit",
+"Cancel" => "Zrušit",
 "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",
-"Edit" => "Upravit",
-"Delete" => "Smazat",
-"Cancel" => "Zrušit",
 "Address" => "Adresa",
-"Add bookmark" => "Přidat záložku",
+"Add" => "Přidat",
-"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 <br />" => "Záložky <br />",
+"You can also try to import a bookmark file" => "Můžete také zkusit importovat soubor záložek",
-"Import bookmarks" => "Importovat záložky",
+"Bookmarklet" => "Rutina pro záložky",
-"html bookmarks file" => "soubor záložek html",
+"Export & Import" => "Import a export",
-"Import" => "Importovat",
+"Export" => "Exportovat",
-"Export bookmarks" => "Exportovat záložky",
+"Import" => "Importovat"
-"Export" => "Exportovat"
 );

l10n/da.php

@@ -11,23 +11,16 @@
 "The address of the page" => "Sidens adresse",
 "Description of the page" => "Sidens beskrivelse",
 "Save" => "Gem",
+"Delete" => "Slet",
+"Edit" => "Rediger",
+"Cancel" => "Annuller",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Træk denne til dine browserbogmærker pg klik på den, når du ønsker at lynoprette et bogmærke til hjemmesiden:",
 "Read later" => "Læs senere",
-"Edit" => "Rediger",
-"Delete" => "Slet",
-"Cancel" => "Annuller",
 "Address" => "Adresser",
-"Add bookmark" => "Tilføj bogmærke",
+"Add" => "Tilføj",
-"List" => "Liste",
-"Image" => "Billede",
-"Hide" => "Gem",
-"Show" => "Vis",
 "Related Tags" => "Relaterede Tags",
 "Settings" => "Indstillinger",
 "You have no bookmarks" => "Du har ingen bogmærker",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"Export" => "Exporter",
-"Import bookmarks" => "Importer bogmærker",
+"Import" => "Importer"
-"Import" => "Importer",
-"Export bookmarks" => "Exporter bogmærker",
-"Export" => "Exporter"
 );

l10n/de.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Dateityp wird für den Import nicht unterstützt",
 "Bookmarks" => "Lesezeichen",
 "Tags" => "Tags",
+"Filter by tag" => "Filtern nach Schlagwort",
 "Edit bookmark" => "Lesezeichen bearbeiten",
 "Are you sure you want to remove this tag from every entry?" => "Soll dieses Schlagwort wirklich von allen Einträgen entfernt werden?",
 "Warning" => "Warnung",
+"Import completed successfully." => "Der Import wurde erfolgreich abgeschlossen.",
+"Uploading..." => "Lade hoch ...",
 "Bookm." => "Lesez.",
 "Add a bookmark" => "Ein Lesezeichen hinzufügen",
 "Close" => "Schließen",
@@ -11,23 +15,19 @@
 "The address of the page" => "Die Adresse der Seite",
 "Description of the page" => "Die Beschreibung der Seite",
 "Save" => "Speichern",
+"Delete" => "Löschen",
+"Edit" => "Bearbeiten",
+"Cancel" => "Abbrechen",
 "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",
-"Edit" => "Bearbeiten",
-"Delete" => "Löschen",
-"Cancel" => "Abbrechen",
 "Address" => "Adresse",
-"Add bookmark" => "Lesezeichen hinzufügen",
+"Add" => "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 <br />" => "Bookmarklet <br />",
+"You can also try to import a bookmark file" => "Du kannst auch versuchen eine Lesezeichendatei zu importieren.",
-"Import bookmarks" => "Lesezeichen importieren",
+"Bookmarklet" => "Bookmarklet",
-"Import" => "Importieren",
+"Export & Import" => "Export & Import",
-"Export bookmarks" => "Lesezeichen exportieren",
+"Export" => "Exportieren",
-"Export" => "Exportieren"
+"Import" => "Importieren"
 );

l10n/de_DE.php

@@ -2,6 +2,7 @@
 "Unsupported file type for import" => "Dateityp wird für den Import nicht unterstützt",
 "Bookmarks" => "Lesezeichen",
 "Tags" => "Tags",
+"Filter by tag" => "Filtern nach Schlagwort",
 "Edit bookmark" => "Lesezeichen bearbeiten",
 "Are you sure you want to remove this tag from every entry?" => "Soll dieses Schlagwort wirklich von allen Einträgen entfernt werden?",
 "Warning" => "Warnung",
@@ -14,24 +15,19 @@
 "The address of the page" => "Die Adresse der Seite",
 "Description of the page" => "Die Beschreibung der Seite",
 "Save" => "Speichern",
+"Delete" => "Löschen",
+"Edit" => "Bearbeiten",
+"Cancel" => "Abbrechen",
 "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",
-"Edit" => "Bearbeiten",
-"Delete" => "Löschen",
-"Cancel" => "Abbrechen",
 "Address" => "Adresse",
-"Add bookmark" => "Lesezeichen hinzufügen",
+"Add" => "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 <br />" => "Bookmarklet <br />",
+"You can also try to import a bookmark file" => "Sie können auch versuchen, eine Lesezeichen Datei zu importieren.",
-"Import bookmarks" => "Lesezeichen importieren",
+"Bookmarklet" => "Bookmarklet",
-"html bookmarks file" => "HTML-Lesezeichen-Datei",
+"Export & Import" => "Export & Import",
-"Import" => "Importieren",
+"Export" => "Exportieren",
-"Export bookmarks" => "Lesezeichen exportieren",
+"Import" => "Importieren"
-"Export" => "Exportieren"
 );

l10n/el.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Δεν υποστηρίζεται o τύπος αρχείου για εισαγωγή",
 "Bookmarks" => "Σελιδοδείκτες",
 "Tags" => "Ετικέτες",
+"Filter by tag" => "Φιλτράρισμα βάσει ετικέτας",
 "Edit bookmark" => "Επεξεργασία σελιδοδείκτη",
 "Are you sure you want to remove this tag from every entry?" => "Είστε σίγουρος για την αφαίρεση αυτής της ετικέτας από κάθε καταχώρηση;",
 "Warning" => "Προειδοποίηση",
+"Import completed successfully." => "Η εισαγωγή ολοκληρώθηκε επιτυχώς.",
+"Uploading..." => "Μεταφόρτωση...",
 "Bookm." => "Σελιδοδεικτ.",
 "Add a bookmark" => "Προσθήκη σελιδοδείκτη",
 "Close" => "Κλείσιμο",
@@ -11,23 +15,19 @@
 "The address of the page" => "Διεύθυνση της σελίδας",
 "Description of the page" => "Περιγραφή της σελίδας",
 "Save" => "Αποθήκευση",
+"Delete" => "Διαγραφή",
+"Edit" => "Επεξεργασία",
+"Cancel" => "Ακύρωση",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Σύρετε αυτό στους σελιδοδείκτες του περιηγητή σας και κάντε κλικ επάνω του, όταν θέλετε να προσθέσετε σύντομα μια ιστοσελίδα ως σελιδοδείκτη:",
 "Read later" => "Ανάγνωση αργότερα",
-"Edit" => "Επεξεργασία",
-"Delete" => "Διαγραφή",
-"Cancel" => "Ακύρωση",
 "Address" => "Διεύθυνση",
-"Add bookmark" => "Προσθήκη σελιδοδείκτη",
+"Add" => "Προσθήκη",
-"List" => "Λίστα",
-"Image" => "Εικόνα",
-"Hide" => "Απόκρυψη",
-"Show" => "Εμφάνιση",
 "Related Tags" => "Σχετικές ετικέτες",
 "Settings" => "Ρυθμίσεις",
 "You have no bookmarks" => "Δεν έχετε σελιδοδείκτες",
-"Bookmarklet <br />" => "Εφαρμογίδιο Σελιδοδεικτών <br />",
+"You can also try to import a bookmark file" => "Μπορείτε να δοκιμάσετε να εισάγεται ένα αρχείο σελιδοδεικτών",
-"Import bookmarks" => "Εισαγωγή σελιδοδεικτών",
+"Bookmarklet" => "Εφαρμογίδιο Σελιδοδεικτών",
-"Import" => "Εισαγωγή",
+"Export & Import" => "Εξαγωγή & Εισαγωγή",
-"Export bookmarks" => "Εξαγωγή σελιδοδεικτών",
+"Export" => "Εξαγωγή",
-"Export" => "Εξαγωγή"
+"Import" => "Εισαγωγή"
 );

l10n/eo.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Dosiertipo nekongrua kun enporto",
 "Bookmarks" => "Legosignoj",
 "Tags" => "Etikedoj",
+"Filter by tag" => "Filtri laŭ etikedo",
 "Edit bookmark" => "Redakti legosignon",
 "Are you sure you want to remove this tag from every entry?" => "Ĉu vi vere volas forigi ĉi tiun etikedon el ĉiu ero?",
 "Warning" => "Averto",
+"Import completed successfully." => "Enporto plenumiĝis sukcese.",
+"Uploading..." => "Alŝutante...",
 "Bookm." => "Legos.",
 "Add a bookmark" => "Aldoni legosignon",
 "Close" => "Fermi",
@@ -11,23 +15,19 @@
 "The address of the page" => "Adreso de la paĝo",
 "Description of the page" => "Priskribo de la paĝo",
 "Save" => "Konservi",
+"Delete" => "Forigi",
+"Edit" => "Redakti",
+"Cancel" => "Nuligi",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ŝovu tion ĉi al la legosignoj de via TTT-legilo kaj klaku ĝin, se vi volas rapide legosignigi TTT-paĝon:",
 "Read later" => "Legi poste",
-"Edit" => "Redakti",
-"Delete" => "Forigi",
-"Cancel" => "Nuligi",
 "Address" => "Adreso",
-"Add bookmark" => "Aldoni legosignon",
+"Add" => "Aldoni",
-"List" => "Listo",
-"Image" => "Bildo",
-"Hide" => "Malmontri",
-"Show" => "Montri",
 "Related Tags" => "Rilataj etikedoj",
 "Settings" => "Agordo",
 "You have no bookmarks" => "Vi havas neniun legosignon",
-"Bookmarklet <br />" => "Kodosigno <br />",
+"You can also try to import a bookmark file" => "Vi povas ankaŭ provi enporti legosignan dosieron",
-"Import bookmarks" => "Enporti legosignojn",
+"Bookmarklet" => "Kodosigno",
-"Import" => "Enporti",
+"Export & Import" => "Malenporti kaj enporti",
-"Export bookmarks" => "Elporti legosignojn",
+"Export" => "Elporti",
-"Export" => "Elporti"
+"Import" => "Enporti"
 );

l10n/es.php

@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Tipo de archivo no compatible para importar",
 "Bookmarks" => "Marcadores",
 "Tags" => "Etiquetas",
+"Filter by tag" => "Filtro por etiquetas",
 "Edit bookmark" => "Editar marcador",
 "Are you sure you want to remove this tag from every entry?" => "Esta seguro que desea remover este tag de todas las entradas?",
 "Warning" => "Preacucion",
 "Import completed successfully." => "Importación completada con éxito",
+"Uploading..." => "Subiendo...",
 "Bookm." => "Marc.",
 "Add a bookmark" => "Agregar a marcadores",
 "Close" => "cerrrar",
@@ -12,23 +15,19 @@
 "The address of the page" => "Direccion de la pagina",
 "Description of the page" => "Descripcion de la pagina",
 "Save" => "Guardar",
+"Delete" => "Eliminar",
+"Edit" => "Editar",
+"Cancel" => "Cancelar",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arrastra desde aquí a los marcadores de tu navegador, y haz clic cuando quieras marcar una página web rápidamente:",
 "Read later" => "Leer después",
-"Edit" => "Editar",
-"Delete" => "Eliminar",
-"Cancel" => "Cancelar",
 "Address" => "Dirección",
-"Add bookmark" => "Agregar Marcador",
+"Add" => "Adicionar",
-"List" => "Lista",
-"Image" => "Imagen",
-"Hide" => "Ocultar",
-"Show" => "Mostrar",
 "Related Tags" => "Tags relacionados",
 "Settings" => "Ajustes",
 "You have no bookmarks" => "No tienes marcadores",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"You can also try to import a bookmark file" => "También puede intentar importar un archivo de marcadores",
-"Import bookmarks" => "Importar marcadores",
+"Bookmarklet" => "Marcador de JavaScript",
-"Import" => "Importart",
+"Export & Import" => "Exportar e Importar",
-"Export bookmarks" => "Exportar marcadores",
+"Export" => "Exportar",
-"Export" => "Exportar"
+"Import" => "Importart"
 );

l10n/es_AR.php

@@ -2,6 +2,7 @@
 "Unsupported file type for import" => "Tipo de archivo no soportado para importar",
 "Bookmarks" => "Marcadores",
 "Tags" => "Etiquetas",
+"Filter by tag" => "Filtrar por etiquetas",
 "Edit bookmark" => "Editar marcadores",
 "Are you sure you want to remove this tag from every entry?" => "¿Estás seguro de que querés borrar esta etiqueta de todos los elementos?",
 "Warning" => "Atención",
@@ -14,24 +15,19 @@
 "The address of the page" => "La dirección de la página",
 "Description of the page" => "Descripción de la página",
 "Save" => "Guardar",
+"Delete" => "Borrar",
+"Edit" => "Editar",
+"Cancel" => "Cancelar",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arrastrá desde aquí a los marcadores de tu navegador, y hacé click cuando quieras marcar una página web:",
 "Read later" => "Leer después",
-"Edit" => "Editar",
-"Delete" => "Borrar",
-"Cancel" => "Cancelar",
 "Address" => "Dirección",
-"Add bookmark" => "Agregar marcador",
+"Add" => "Agregar",
-"List" => "Lista",
-"Image" => "Imagen",
-"Hide" => "Ocultar",
-"Show" => "Mostrar",
 "Related Tags" => "Etiquetas relacionadas",
 "Settings" => "Configuración",
 "You have no bookmarks" => "No tenés marcadores",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"You can also try to import a bookmark file" => "También podés intentar importar un archivo de marcadores",
-"Import bookmarks" => "Importar marcadores",
+"Bookmarklet" => "Marcadores",
-"html bookmarks file" => "Archivo de marcadores HTML",
+"Export & Import" => "Exportar e importar",
-"Import" => "Importar",
+"Export" => "Exportar",
-"Export bookmarks" => "Exportar marcadores",
+"Import" => "Importar"
-"Export" => "Exportar"
 );

l10n/et_EE.php

@@ -4,6 +4,7 @@
 "Edit bookmark" => "Muuda järjehoidjat",
 "Are you sure you want to remove this tag from every entry?" => "Oled sa kindel, et sa soovid kõigilt sissekannetelt seda silti eemaldada?",
 "Warning" => "Hoiatus",
+"Uploading..." => "Üleslaadimine...",
 "Bookm." => "Järjeh.",
 "Add a bookmark" => "Lisa järjehoidja",
 "Close" => "Sulge",
@@ -11,23 +12,16 @@
 "The address of the page" => "Lehe aadress",
 "Description of the page" => "Lehe kirjeldus",
 "Save" => "Salvesta",
+"Delete" => "Kustuta",
+"Edit" => "Muuda",
+"Cancel" => "Loobu",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Lohista see oma veebilehitseja järjehoidjatesse ja kliki sellele, kui sa soovid veebilehte kiirelt lisada:",
 "Read later" => "Loe hiljem",
-"Edit" => "Muuda",
-"Delete" => "Kustuta",
-"Cancel" => "Loobu",
 "Address" => "Aadress",
-"Add bookmark" => "Lisa järjehoidja",
+"Add" => "Lisa",
-"List" => "Nimekiri",
-"Image" => "Pilt",
-"Hide" => "Peida",
-"Show" => "Näita",
 "Related Tags" => "Seotud sildid",
 "Settings" => "Seaded",
 "You have no bookmarks" => "Sul pole järjehoidjaid",
-"Bookmarklet <br />" => "Järjehoidja vidin <br />",
+"Export" => "Ekspordi",
-"Import bookmarks" => "Impordi järjehoidjaid",
+"Import" => "Impordi"
-"Import" => "Impordi",
-"Export bookmarks" => "Ekspordi järjehoidjaid",
-"Export" => "Ekspordi"
 );

l10n/eu.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Fitxategi mota hau ez da onartzen inportatzeko.",
 "Bookmarks" => "Laster-markak",
 "Tags" => "Etiketak",
+"Filter by tag" => "Iragazi etiketaren arabera",
 "Edit bookmark" => "Editatu laster-marka",
 "Are you sure you want to remove this tag from every entry?" => "Ziur zaude etiketa hau sarrera guztietatik ezabatu nahi duzula?",
 "Warning" => "Abisua",
+"Import completed successfully." => "Inportazioa ongi egin da.",
+"Uploading..." => "Igotzen...",
 "Bookm." => "Lasterm.",
 "Add a bookmark" => "Gehitu laster-marka",
 "Close" => "Itxi",
@@ -11,23 +15,19 @@
 "The address of the page" => "Orriaren helbidea",
 "Description of the page" => "Orriaren deskribapena",
 "Save" => "Gorde",
+"Delete" => "Ezabatu",
+"Edit" => "Editatu",
+"Cancel" => "Ezeztatu",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Web orri bat laster-marketara azkar gehitzeko, arrastratu hau zure arakatzailearen laster-marketara eta klikatu bertan:",
 "Read later" => "Irakurri geroago",
-"Edit" => "Editatu",
-"Delete" => "Ezabatu",
-"Cancel" => "Ezeztatu",
 "Address" => "Helbidea",
-"Add bookmark" => "Gehitu laster-marka",
+"Add" => "Gehitu",
-"List" => "Zerrenda",
-"Image" => "Irudia",
-"Hide" => "Ezkutatu",
-"Show" => "Bistaratu",
 "Related Tags" => "Erlazionatutako etiketak",
 "Settings" => "Ezarpenak",
 "You have no bookmarks" => "Ez duzu laster-markarik",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"You can also try to import a bookmark file" => "Laster-marka fitxategi bat inportatzen saia zaitezke",
-"Import bookmarks" => "Inportatu laster-markak",
+"Bookmarklet" => "Bookmarklet",
-"Import" => "Inportatu",
+"Export & Import" => "Exportatu eta inportatu",
-"Export bookmarks" => "Exportatu laster-markak",
+"Export" => "Exportatu",
-"Export" => "Exportatu"
+"Import" => "Inportatu"
 );

l10n/fa.php

@@ -4,15 +4,15 @@
 "Warning" => "اخطار",
 "Close" => "بستن",
 "Save" => "ذخیره",
+"Delete" => "حذف",
+"Edit" => "ویرایش",
+"Cancel" => "منصرف شدن",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "هنگامی که می‌خواهید کی صفحه‌ی اینترنتی را بسرعت نشان کنید، این را به نشانه‌های مرورگر خود بکشید و روی آن کلیک کنید.",
 "Read later" => "بعد خوانده‌شود",
-"Edit" => "ویرایش",
-"Delete" => "حذف",
-"Cancel" => "منصرف شدن",
 "Address" => "آدرس",
-"List" => "فهرست",
+"Add" => "افزودن",
 "Settings" => "تنظیمات",
 "You have no bookmarks" => "شما هیچ نشانکی ندارید",
-"Import" => "وارد کردن",
+"Export" => "خروجی گرفتن",
-"Export" => "خروجی گرفتن"
+"Import" => "وارد کردن"
 );

l10n/fi_FI.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Tuonti ei tue kyseistä tiedostotyyppiä",
 "Bookmarks" => "Kirjanmerkit",
 "Tags" => "Tunnisteet",
+"Filter by tag" => "Suodata tunnisteen perusteella",
 "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,23 +15,19 @@
 "The address of the page" => "Sivun osoite",
 "Description of the page" => "Sivun kuvaus",
 "Save" => "Tallenna",
+"Delete" => "Poista",
+"Edit" => "Muokkaa",
+"Cancel" => "Peru",
 "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",
-"Edit" => "Muokkaa",
-"Delete" => "Poista",
-"Cancel" => "Peru",
 "Address" => "Osoite",
-"Add bookmark" => "Lisää kirjanmerkki",
+"Add" => "Lisää",
-"List" => "Lista",
-"Image" => "Kuva",
-"Hide" => "Piilota",
-"Show" => "Näytä",
 "Related Tags" => "Vastaavanlaiset tunnisteet",
 "Settings" => "Asetukset",
 "You have no bookmarks" => "Sinulla ei ole kirjanmerkkejä",
-"Bookmarklet <br />" => "Kirjanmerkitsin <br />",
+"You can also try to import a bookmark file" => "Voit myös yrittää tuoda kirjanmerkkitiedoston",
-"Import bookmarks" => "Tuo kirjanmerkkejä",
+"Bookmarklet" => "Kirjanmerkitsin",
-"Import" => "Tuo",
+"Export & Import" => "Vienti ja tuonti",
-"Export bookmarks" => "Vie kirjanmerkkejä",
+"Export" => "Vie",
-"Export" => "Vie"
+"Import" => "Tuo"
 );

l10n/fr.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Type de fichier non supporté pour l'importation",
 "Bookmarks" => "Favoris",
 "Tags" => "Étiquettes",
+"Filter by tag" => "Filtrer par étiquette",
 "Edit bookmark" => "Modifier le favori",
 "Are you sure you want to remove this tag from every entry?" => "Êtes-vous certain de vouloir retirer cette étiquette de chaque entrée ?",
 "Warning" => "Attention",
+"Import completed successfully." => "L'importation s'est achevée avec succès",
+"Uploading..." => "Téléversement en cours…",
 "Bookm." => "Fav.",
 "Add a bookmark" => "Ajouter un favori",
 "Close" => "Fermer",
@@ -11,23 +15,19 @@
 "The address of the page" => "L'adresse de la page",
 "Description of the page" => "Description de la page",
 "Save" => "Sauvegarder",
+"Delete" => "Supprimer",
+"Edit" => "Modifier",
+"Cancel" => "Annuler",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Glissez ceci dans les favoris de votre navigateur, et cliquer dessus lorsque vous souhaitez ajouter la page en cours à vos marques-pages :",
 "Read later" => "Lire plus tard",
-"Edit" => "Modifier",
-"Delete" => "Supprimer",
-"Cancel" => "Annuler",
 "Address" => "Adresse",
-"Add bookmark" => "Ajouter le favori",
+"Add" => "Ajouter",
-"List" => "Lister",
-"Image" => "Image",
-"Hide" => "Masquer",
-"Show" => "Afficher",
 "Related Tags" => "Étiquettes similaires",
 "Settings" => "Paramètres",
 "You have no bookmarks" => "Vous n'avez aucun favori",
-"Bookmarklet <br />" => "Gestionnaire de favoris <br />",
+"You can also try to import a bookmark file" => "Vous pouvez également essayer l'import d'un fichier de favoris",
-"Import bookmarks" => "Importer des favoris",
+"Bookmarklet" => "Applisignet",
-"Import" => "Importer",
+"Export & Import" => "Importer et Exporter",
-"Export bookmarks" => "Exporter les favoris",
+"Export" => "Exporter",
-"Export" => "Exporter"
+"Import" => "Importer"
 );

l10n/gl.php

@@ -1,20 +1,33 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Tipo de ficheiro non admitido para a importación",
 "Bookmarks" => "Marcadores",
 "Tags" => "Etiquetas",
-"Warning" => "Advertencia",
+"Filter by tag" => "Filtrar segundo a etiqueta",
-"Bookm." => "Marcad.",
+"Edit bookmark" => "Editar o marcador",
+"Are you sure you want to remove this tag from every entry?" => "Confirma que quere eliminar esta etiqueta de todas as entradas?",
+"Warning" => "Aviso",
+"Import completed successfully." => "Completouse correctamente a importación.",
+"Uploading..." => "Enviando...",
+"Bookm." => "Marc.",
+"Add a bookmark" => "Engadir un marcador",
 "Close" => "Pechar",
+"The title of the page" => "O título da páxina",
+"The address of the page" => "O enderezo desta páxina",
+"Description of the page" => "Descrición da páxina",
 "Save" => "Gardar",
-"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:",
-"Read later" => "Ler máis tarde",
-"Edit" => "Editar",
 "Delete" => "Eliminar",
+"Edit" => "Editar",
 "Cancel" => "Cancelar",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arrastre isto aos marcadores do seu navegador e prema nel cando queira marcar unha páxina con rapidez:",
+"Read later" => "Ler máis tarde",
 "Address" => "Enderezo",
-"List" => "Lista",
+"Add" => "Engadir",
+"Related Tags" => "Etiquetas relacionadas",
 "Settings" => "Preferencias",
 "You have no bookmarks" => "Non ten marcadores",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"You can also try to import a bookmark file" => "Tamén pode intentar importar un ficheiro de marcadores",
-"Import" => "Importar",
+"Bookmarklet" => "Marcador",
-"Export" => "Exportar"
+"Export & Import" => "Exportar e importar",
+"Export" => "Exportar",
+"Import" => "Importar"
 );

l10n/he.php

@@ -3,15 +3,15 @@
 "Tags" => "תגיות",
 "Close" => "סגירה",
 "Save" => "שמירה",
+"Delete" => "מחיקה",
+"Edit" => "עריכה",
+"Cancel" => "ביטול",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "ניתן לגרור את הקישור הזה אל סרגל הסימניות בדפדפן שלך וללחוץ עליו כאשר מעוניינים ליצור סימניה לאתר במהירות.",
 "Read later" => "קריאה מאוחרת",
-"Edit" => "עריכה",
-"Delete" => "מחיקה",
-"Cancel" => "ביטול",
 "Address" => "כתובת",
-"List" => "רשימה",
+"Add" => "הוספה",
 "Settings" => "הגדרות",
 "You have no bookmarks" => "אין ברשותך סימניות",
-"Import" => "יבא",
+"Export" => "יצוא",
-"Export" => "יצוא"
+"Import" => "יבא"
 );

l10n/hr.php

@@ -2,12 +2,12 @@
 "Bookmarks" => "Zabilješke",
 "Close" => "Zatvori",
 "Save" => "Snimi",
-"Edit" => "Uredi",
 "Delete" => "Obriši",
+"Edit" => "Uredi",
 "Cancel" => "Odustani",
 "Address" => "Adresa",
-"List" => "Lista",
+"Add" => "Dodaj",
 "Settings" => "Postavke",
-"Import" => "Uvezi",
+"Export" => "Izvoz",
-"Export" => "Izvoz"
+"Import" => "Uvezi"
 );

l10n/hu_HU.php

@@ -4,16 +4,15 @@
 "Warning" => "Figyelmeztetés",
 "Close" => "Bezár",
 "Save" => "Mentés",
+"Delete" => "Törlés",
+"Edit" => "Szerkesztés",
+"Cancel" => "Mégsem",
 "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!",
 "Read later" => "Később olvasom",
-"Edit" => "Szerkesztés",
-"Delete" => "Törlés",
-"Cancel" => "Mégsem",
 "Address" => "Cím",
-"List" => "Lista",
+"Add" => "Hozzáad",
 "Settings" => "Beállítások",
 "You have no bookmarks" => "Nincsenek könyvjelzőid",
-"Bookmarklet <br />" => "Könyvjelzőalkalmazás <br />",
+"Export" => "Exportálás",
-"Import" => "Import",
+"Import" => "Import"
-"Export" => "Exportálás"
 );

l10n/ia.php

@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Close" => "Clauder",
 "Save" => "Salveguardar",
-"Edit" => "Modificar",
 "Delete" => "Deler",
+"Edit" => "Modificar",
 "Cancel" => "Cancellar",
 "Address" => "Adresse",
-"List" => "Lista",
+"Add" => "Adder",
 "Settings" => "Configurationes",
-"Import" => "Importar",
+"Export" => "Exportar",
-"Export" => "Exportar"
+"Import" => "Importar"
 );

l10n/id.php

@@ -4,17 +4,14 @@
 "Close" => "tutup",
 "The title of the page" => "judul laman",
 "Save" => "simpan",
-"Read later" => "baca nanti",
-"Edit" => "ubah",
 "Delete" => "hapus",
+"Edit" => "ubah",
 "Cancel" => "batal",
+"Read later" => "baca nanti",
 "Address" => "alamat",
-"List" => "daftar",
+"Add" => "tambah",
-"Image" => "gambar",
-"Hide" => "sembunyikan",
-"Show" => "tampilkan",
 "Related Tags" => "label terkait",
 "Settings" => "pengaturan",
-"Import" => "mengimpor",
+"Export" => "mengekspor",
-"Export" => "mengekspor"
+"Import" => "mengimpor"
 );

l10n/it.php

@@ -2,6 +2,7 @@
 "Unsupported file type for import" => "Tipo di file non supportato per l'importazione",
 "Bookmarks" => "Segnalibri",
 "Tags" => "Tag",
+"Filter by tag" => "Filtro per etichetta",
 "Edit bookmark" => "Modifica segnalibro",
 "Are you sure you want to remove this tag from every entry?" => "Sei sicuro di voler rimuovere questo tag da ogni voce?",
 "Warning" => "Avviso",
@@ -14,24 +15,19 @@
 "The address of the page" => "L'indirizzo della pagina",
 "Description of the page" => "Descrizione della pagina",
 "Save" => "Salva",
+"Delete" => "Elimina",
+"Edit" => "Modifica",
+"Cancel" => "Annulla",
 "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",
-"Edit" => "Modifica",
-"Delete" => "Elimina",
-"Cancel" => "Annulla",
 "Address" => "Indirizzo",
-"Add bookmark" => "Aggiungi segnalibro",
+"Add" => "Aggiungi",
-"List" => "Elenco",
-"Image" => "Immagine",
-"Hide" => "Nascondi",
-"Show" => "Mostra",
 "Related Tags" => "Tag correlati",
 "Settings" => "Impostazioni",
 "You have no bookmarks" => "Non hai segnalibri",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"You can also try to import a bookmark file" => "Puoi anche provare a importare un file di segnalibri",
-"Import bookmarks" => "Importa segnalibri",
+"Bookmarklet" => "Bookmarklet",
-"html bookmarks file" => "File di segnalibri html",
+"Export & Import" => "Esporta e importa",
-"Import" => "Importa",
+"Export" => "Esporta",
-"Export bookmarks" => "Esporta segnalibri",
+"Import" => "Importa"
-"Export" => "Esporta"
 );

l10n/ja_JP.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "インポートでは未サポートのファイルタイプ",
 "Bookmarks" => "ブックマーク",
 "Tags" => "タグ",
+"Filter by tag" => "タグによるフィルタ",
 "Edit bookmark" => "ブックマークを編集",
 "Are you sure you want to remove this tag from every entry?" => "すべてのエントリからこのタグを削除してもよろしいですか？",
 "Warning" => "警告",
+"Import completed successfully." => "インポートは正常に完了しました。",
+"Uploading..." => "アップロード中...",
 "Bookm." => "ブックマーク",
 "Add a bookmark" => "ブックマークを追加",
 "Close" => "閉じる",
@@ -11,23 +15,19 @@
 "The address of the page" => "ページのアドレス",
 "Description of the page" => "ページの説明",
 "Save" => "保存",
+"Delete" => "削除",
+"Edit" => "編集",
+"Cancel" => "キャンセル",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Webページをすぐにブックマークしたい場合は、これをブラウザのブックマークにドラッグし、クリックしてください:",
 "Read later" => "後で確認",
-"Edit" => "編集",
-"Delete" => "削除",
-"Cancel" => "キャンセル",
 "Address" => "アドレス",
-"Add bookmark" => "ブックマークを追加",
+"Add" => "追加",
-"List" => "一覧",
-"Image" => "画像",
-"Hide" => "非表示",
-"Show" => "表示",
 "Related Tags" => "関連タグ",
 "Settings" => "設定",
 "You have no bookmarks" => "ブックマークがありません",
-"Bookmarklet <br />" => "ブックマークレット <br />",
+"You can also try to import a bookmark file" => "ブックマークファイルのインポートも可能です",
-"Import bookmarks" => "ブックマークをインポート",
+"Bookmarklet" => "ブックマークレット",
-"Import" => "インポート",
+"Export & Import" => "エクスポート＆インポート",
-"Export bookmarks" => "ブックマークをエクスポート",
+"Export" => "エクスポート",
-"Export" => "エクスポート"
+"Import" => "インポート"
 );

l10n/ka_GE.php

@@ -11,23 +11,16 @@
 "The address of the page" => "გვერდის მისამართი",
 "Description of the page" => "გვერდის დახასიათება",
 "Save" => "შენახვა",
+"Delete" => "წაშლა",
+"Edit" => "რედაქტირება",
+"Cancel" => "უარყოფა",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "გადაათრიეთ ეს თქვენს ბუქმარკებში თუ გინდათ რომ საითი სწრაფად დაბუქმარკდეს",
 "Read later" => "წაიკითხე მოგვიანებით",
-"Edit" => "რედაქტირება",
-"Delete" => "წაშლა",
-"Cancel" => "უარყოფა",
 "Address" => "მისამართი",
-"Add bookmark" => "ბუქმარქის დამატება",
+"Add" => "დამატება",
-"List" => "სია",
-"Image" => "სურათი",
-"Hide" => "დამალვა",
-"Show" => "გამოჩენა",
 "Related Tags" => "Related Tags",
 "Settings" => "პარამეტრები",
 "You have no bookmarks" => "თქვენ არ გაქვთ ბუქმარკები",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"Export" => "ექსპორტი",
-"Import bookmarks" => "ბუქმარქების იმპორტი",
+"Import" => "იმპორტი"
-"Import" => "იმპორტი",
-"Export bookmarks" => "ბუქმარქების ექსპორტი",
-"Export" => "ექსპორტი"
 );

l10n/ko.php

@@ -1,13 +1,33 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "가져올 수 없는 파일 형식임",
+"Bookmarks" => "책갈피",
+"Tags" => "태그",
+"Filter by tag" => "태그로 필터링",
+"Edit bookmark" => "책갈피 편집",
+"Are you sure you want to remove this tag from every entry?" => "모든 항목에서 이 태그를 삭제하시겠습니까?",
 "Warning" => "경고",
+"Import completed successfully." => "성공적으로 가져왔습니다.",
+"Uploading..." => "업로드 중...",
+"Bookm." => "책갈피",
+"Add a bookmark" => "책갈피 추가",
 "Close" => "닫기",
+"The title of the page" => "페이지 제목",
+"The address of the page" => "페이지 주소",
+"Description of the page" => "페이지 설명",
 "Save" => "저장",
-"Edit" => "편집",
 "Delete" => "삭제",
+"Edit" => "편집",
 "Cancel" => "취소",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "웹 브라우저 책갈피 항목에 다음 링크를 끌어다 놓으면 나중에 볼 웹 페이지를 빠르게 구독할 때 사용할 수 있습니다:",
+"Read later" => "나중에 읽기",
 "Address" => "주소",
-"List" => "목록",
+"Add" => "추가",
+"Related Tags" => "관련된 태그",
 "Settings" => "설정",
-"Import" => "가져오기",
+"You have no bookmarks" => "책갈피가 없습니다",
-"Export" => "내보내기"
+"You can also try to import a bookmark file" => "책갈피 파일을 가져올 수 있습니다",
+"Bookmarklet" => "북마크릿",
+"Export & Import" => "내보내기 & 가져오기",
+"Export" => "내보내기",
+"Import" => "가져오기"
 );

l10n/ku_IQ.php

@@ -8,9 +8,9 @@
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "رابکێشه‌ ئه‌مه بۆ دڵخوازه‌کان له‌ وێبگه‌ڕه‌که‌ت وه‌ کرته‌ بکه‌ لێی، کاتێك ده‌ته‌وێت ماڵپه‌ڕێك دڵخواز بکه‌ی به‌خێرای:",
 "Read later" => "دووای بیخوێنه‌وه",
 "Address" => "ناونیشان",
+"Add" => "زیادکردن",
 "Settings" => "ده‌ستكاری",
 "You have no bookmarks" => "تۆ دڵخوازت نیه",
-"Bookmarklet <br />" => "دڵخوازکرا <br />",
+"Export" => "هه‌ناردن",
-"Import" => "هێنان",
+"Import" => "هێنان"
-"Export" => "هه‌ناردن"
 );

l10n/lb.php

@@ -2,12 +2,12 @@
 "Warning" => "Warnung",
 "Close" => "Zoumaachen",
 "Save" => "Späicheren",
-"Edit" => "Editéieren",
 "Delete" => "Läschen",
+"Edit" => "Editéieren",
 "Cancel" => "Ofbriechen",
 "Address" => "Adress",
-"List" => "Lescht",
+"Add" => "Dobäisetzen",
 "Settings" => "Astellungen",
-"Import" => "Import",
+"Export" => "Export",
-"Export" => "Export"
+"Import" => "Import"
 );

l10n/lt_LT.php

@@ -3,12 +3,12 @@
 "Warning" => "Įspėjimas",
 "Close" => "Užverti",
 "Save" => "Išsaugoti",
-"Edit" => "Redaguoti",
 "Delete" => "Ištrinti",
+"Edit" => "Redaguoti",
 "Cancel" => "Atšaukti",
 "Address" => "Adresas",
-"List" => "Sąrašas",
+"Add" => "Pridėti",
 "Settings" => "Nustatymai",
-"Import" => "Importuoti",
+"Export" => "Eksportuoti",
-"Export" => "Eksportuoti"
+"Import" => "Importuoti"
 );

l10n/mk.php

@@ -2,12 +2,12 @@
 "Warning" => "Предупредување",
 "Close" => "Затвои",
 "Save" => "Сними",
-"Edit" => "Уреди",
 "Delete" => "Избриши",
+"Edit" => "Уреди",
 "Cancel" => "Откажи",
 "Address" => "Адреса",
-"List" => "Листа",
+"Add" => "Додади",
 "Settings" => "Параметри",
-"Import" => "Внеси",
+"Export" => "Извези",
-"Export" => "Извези"
+"Import" => "Внеси"
 );

l10n/ms_MY.php

@@ -3,12 +3,12 @@
 "Warning" => "Amaran",
 "Close" => "Tutup",
 "Save" => "Simpan",
-"Edit" => "Sunting",
 "Delete" => "Padam",
+"Edit" => "Sunting",
 "Cancel" => "Batal",
 "Address" => "Alamat",
-"List" => "Senarai",
+"Add" => "Tambah",
 "Settings" => "Tetapan",
-"Import" => "Import",
+"Export" => "Export",
-"Export" => "Export"
+"Import" => "Import"
 );

l10n/nb_NO.php

@@ -11,23 +11,16 @@
 "The address of the page" => "Adressen til siden",
 "Description of the page" => "Beskrivelse av siden",
 "Save" => "Lagre",
+"Delete" => "Slett",
+"Edit" => "Endre",
+"Cancel" => "Avbryt",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Dra denne over din nettlesers bokmerker og klikk den, hvis du ønsker å hurtig legge til bokmerke for en nettside",
 "Read later" => "Les senere",
-"Edit" => "Endre",
-"Delete" => "Slett",
-"Cancel" => "Avbryt",
 "Address" => "Adresse",
-"Add bookmark" => "Legg til bokmerke",
+"Add" => "Legg til",
-"List" => "Liste",
-"Image" => "Bilde",
-"Hide" => "Skjul",
-"Show" => "Vis",
 "Related Tags" => "Relaterte tagger",
 "Settings" => "Innstillinger",
 "You have no bookmarks" => "Du har ingen bokmerker",
-"Bookmarklet <br />" => "Bokmerke <br />",
+"Export" => "Eksporter",
-"Import bookmarks" => "Importer bokmerker",
+"Import" => "Importer"
-"Import" => "Importer",
-"Export bookmarks" => "Eksporter bokmerker",
-"Export" => "Eksporter"
 );

l10n/nl.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Niet ondersteund bestandstype voor import",
 "Bookmarks" => "Bladwijzers",
 "Tags" => "Tags",
+"Filter by tag" => "Filter op tag",
 "Edit bookmark" => "Bewerk bladwijzer",
 "Are you sure you want to remove this tag from every entry?" => "Bent u zeker dat u deze tag van elk item wilt verwijderen.",
 "Warning" => "Waarschuwing",
+"Import completed successfully." => "Het importeren is helemaal geslaagd",
+"Uploading..." => "Uploading...",
 "Bookm." => "Bladw.",
 "Add a bookmark" => "Voeg een bladwijzer toe",
 "Close" => "Sluit",
@@ -11,23 +15,19 @@
 "The address of the page" => "Het pagina adres",
 "Description of the page" => "Pagina beschrijving",
 "Save" => "Bewaar",
+"Delete" => "Verwijder",
+"Edit" => "Bewerk",
+"Cancel" => "Annuleer",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Sleep dit naar uw browser bladwijzer menu en klik erop, wanneer u een webpagina snel wilt voorzien van een bladwijzer:",
 "Read later" => "Lees later",
-"Edit" => "Bewerk",
-"Delete" => "Verwijder",
-"Cancel" => "Annuleer",
 "Address" => "Adres",
-"Add bookmark" => "Bladwijzer toevoegen",
+"Add" => "Toevoegen",
-"List" => "Lijst",
-"Image" => "Afbeelding",
-"Hide" => "Verbergen",
-"Show" => "Tonen",
 "Related Tags" => "Aanverwante tags",
 "Settings" => "Instellingen",
 "You have no bookmarks" => "U heeft geen bladwijzers",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"You can also try to import a bookmark file" => "U kan ook een bladwijzer bestand proberen te importen",
-"Import bookmarks" => "Importeer bladwijzers",
+"Bookmarklet" => "Bookmarklet",
-"Import" => "Importeer",
+"Export & Import" => "Export & Import",
-"Export bookmarks" => "Exporteer bladwijzers",
+"Export" => "Exporteer",
-"Export" => "Exporteer"
+"Import" => "Importeer"
 );

l10n/nn_NO.php

@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Close" => "Lukk",
 "Save" => "Lagre",
-"Edit" => "Endra",
 "Delete" => "Slett",
+"Edit" => "Endra",
 "Cancel" => "Kanseller",
 "Address" => "Adresse",
-"List" => "Liste",
+"Add" => "Legg til",
 "Settings" => "Innstillingar",
-"Import" => "Importer",
+"Export" => "Eksporter",
-"Export" => "Eksporter"
+"Import" => "Importer"
 );

l10n/oc.php

@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Bookmarks" => "Marcapaginas",
 "Save" => "Enregistra",
-"Edit" => "Editar",
 "Delete" => "Escafa",
+"Edit" => "Editar",
 "Cancel" => "Annula",
-"List" => "Tièra",
+"Add" => "Ajusta",
 "Settings" => "Configuracion",
-"Import" => "Importa",
+"Export" => "Exporta",
-"Export" => "Exporta"
+"Import" => "Importa"
 );

l10n/pl.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Nieobsługiwany typ pliku do importu",
 "Bookmarks" => "Zakładki",
 "Tags" => "Tagi",
+"Filter by tag" => "Filtruj po tagach",
 "Edit bookmark" => "Edytuj zakładkę",
 "Are you sure you want to remove this tag from every entry?" => "Czy na pewno chcesz usunąć ten tag na każdym wejściu?",
 "Warning" => "Ostrzeżenie",
+"Import completed successfully." => "Importowanie zostało pomyślnie ukończone.",
+"Uploading..." => "Wgrywanie....",
 "Bookm." => "Zakładka",
 "Add a bookmark" => "Dodaj zakładkę",
 "Close" => "Zamknij",
@@ -11,23 +15,19 @@
 "The address of the page" => "Adres strony",
 "Description of the page" => "Opis strony",
 "Save" => "Zapisz",
+"Delete" => "Usuń",
+"Edit" => "Edytuj",
+"Cancel" => "Anuluj",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Przeciągnij to do ulubionych przeglądarki i kliknij go, gdy użytkownik chce szybko dodać zakładkę strony sieci Web:",
 "Read later" => "Czytaj później",
-"Edit" => "Edytuj",
-"Delete" => "Usuń",
-"Cancel" => "Anuluj",
 "Address" => "Adres",
-"Add bookmark" => "Dodaj zakładkę",
+"Add" => "Dodaj",
-"List" => "Lista",
-"Image" => "Obraz",
-"Hide" => "Schowaj",
-"Show" => "Pokaż",
 "Related Tags" => "Powiązane Tagi",
 "Settings" => "Ustawienia",
 "You have no bookmarks" => "Nie masz żadnych zakładek",
-"Bookmarklet <br />" => "Skryptozakładka <br />",
+"You can also try to import a bookmark file" => "Można również spróbować zaimportować plik zakładki",
-"Import bookmarks" => "Importuj zakładki",
+"Bookmarklet" => "Zakładka",
-"Import" => "Import",
+"Export & Import" => "Eksportuj i Importuj",
-"Export bookmarks" => "Eksportuj zakładki",
+"Export" => "Export",
-"Export" => "Export"
+"Import" => "Import"
 );

l10n/pt_BR.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Arquivo para importação não suportado",
 "Bookmarks" => "Marcadores",
 "Tags" => "Tags",
+"Filter by tag" => "Filtrar por tag",
 "Edit bookmark" => "Editar bookmark",
 "Are you sure you want to remove this tag from every entry?" => "Tem certeza que deseja remover esta tag de todas as entradas?",
 "Warning" => "Aviso",
+"Import completed successfully." => "Importação completada com sucesso",
+"Uploading..." => "Enviando...",
 "Bookm." => "Marc.",
 "Add a bookmark" => "Adicionar um bookmark",
 "Close" => "Fechar",
@@ -11,23 +15,19 @@
 "The address of the page" => "O endereço da página",
 "Description of the page" => "Descrição da página",
 "Save" => "Salvar",
+"Delete" => "Excluir",
+"Edit" => "Editar",
+"Cancel" => "Cancelar",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arraste isso para os favoritos do seu navegador web e clique nele quando você quiser marcar/favoritar uma página rapidamente:",
 "Read later" => "Ler depois",
-"Edit" => "Editar",
-"Delete" => "Excluir",
-"Cancel" => "Cancelar",
 "Address" => "Endereço",
-"Add bookmark" => "Adicionar bookmark",
+"Add" => "Adicionar",
-"List" => "Listar",
-"Image" => "Imagem",
-"Hide" => "Ocultar",
-"Show" => "Exibir",
 "Related Tags" => "Tags relacionadas",
 "Settings" => "Ajustes",
 "You have no bookmarks" => "Você não tem marcadores",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"You can also try to import a bookmark file" => "Você também pode tentar importar um arquivo de bookmarks.",
-"Import bookmarks" => "Importar bookmarks",
+"Bookmarklet" => "Bookmarklet",
-"Import" => "Importar",
+"Export & Import" => "Exportar e Importar",
-"Export bookmarks" => "Exportar bookmarks",
+"Export" => "Exportar",
-"Export" => "Exportar"
+"Import" => "Importar"
 );

l10n/pt_PT.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Tipo de ficheiro não suportado para importação",
 "Bookmarks" => "Marcadores",
 "Tags" => "Etiquetas",
+"Filter by tag" => "Filtrar por tag",
 "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",
@@ -11,23 +15,19 @@
 "The address of the page" => "O endereço da página",
 "Description of the page" => "Descrição da página",
 "Save" => "Guardar",
+"Delete" => "Apagar",
+"Edit" => "Editar",
+"Cancel" => "Cancelar",
 "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",
-"Edit" => "Editar",
-"Delete" => "Apagar",
-"Cancel" => "Cancelar",
 "Address" => "Endereço",
-"Add bookmark" => "Acrescentar marcador",
+"Add" => "Adicionar",
-"List" => "Lista",
-"Image" => "Imagem",
-"Hide" => "Esconder",
-"Show" => "Mostrar",
 "Related Tags" => "Etiquetas relacionadas",
 "Settings" => "Configurações",
 "You have no bookmarks" => "Não tem marcadores",
-"Bookmarklet <br />" => "Marcador",
+"You can also try to import a bookmark file" => "Também pode tentar importar o ficheiro de favoritos",
-"Import bookmarks" => "Importar marcadores",
+"Bookmarklet" => "Marcadorzinho",
-"Import" => "Importar",
+"Export & Import" => "Exportar & Importar",
-"Export bookmarks" => "Exportar marcadores",
+"Export" => "Exportar",
-"Export" => "Exportar"
+"Import" => "Importar"
 );

l10n/ro.php

@@ -5,16 +5,15 @@
 "Bookm." => "Bookm.",
 "Close" => "Închide",
 "Save" => "Salvează",
+"Delete" => "Șterge",
+"Edit" => "Editează",
+"Cancel" => "Anulare",
 "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:",
 "Read later" => "Citește mai târziu",
-"Edit" => "Editează",
-"Delete" => "Șterge",
-"Cancel" => "Anulare",
 "Address" => "Adresă",
-"List" => "Listă",
+"Add" => "Adaugă",
 "Settings" => "Setări",
 "You have no bookmarks" => "Nu ai nici un semn de carte",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"Export" => "Exportă",
-"Import" => "Importă",
+"Import" => "Importă"
-"Export" => "Exportă"
 );

l10n/ru.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Не подходящий тип файла для импорта",
 "Bookmarks" => "Закладки",
 "Tags" => "Метки",
+"Filter by tag" => "Фильтр по тегу",
 "Edit bookmark" => "Редактировать закладку",
 "Are you sure you want to remove this tag from every entry?" => "Вы уверены, что хотите удалить этот тег из каждой записи?",
 "Warning" => "Предупреждение",
+"Import completed successfully." => "Импортирование завершилось успешно.",
+"Uploading..." => "Загрузка...",
 "Bookm." => "Закл.",
 "Add a bookmark" => "Добавить закладку",
 "Close" => "Закрыть",
@@ -11,23 +15,19 @@
 "The address of the page" => "Адрес страницы",
 "Description of the page" => "Описание страницы",
 "Save" => "Сохранить",
+"Delete" => "Удалить",
+"Edit" => "Редактировать",
+"Cancel" => "Отменить",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Перетащите эту кнопку в закладки вашего браузера и нажимайте на неё для быстрого добавления страницы в закладки:",
 "Read later" => "Прочитать позже",
-"Edit" => "Редактировать",
-"Delete" => "Удалить",
-"Cancel" => "Отменить",
 "Address" => "Адрес",
-"Add bookmark" => "Добавить закладку",
+"Add" => "Добавить",
-"List" => "Список",
-"Image" => "Изображение",
-"Hide" => "Спрятать",
-"Show" => "Показать",
 "Related Tags" => "Связанные теги",
 "Settings" => "Конфигурация",
 "You have no bookmarks" => "У вас нет закладок",
-"Bookmarklet <br />" => "Быстрые закладки<br />",
+"You can also try to import a bookmark file" => "Вы также можете попробовать импортировать файл закладки",
-"Import bookmarks" => "Импортировать закладки",
+"Bookmarklet" => "Bookmarklet",
-"Import" => "Импорт",
+"Export & Import" => "Экспорт & Импорт",
-"Export bookmarks" => "Экспортировать закладки",
+"Export" => "Экспорт",
-"Export" => "Экспорт"
+"Import" => "Импорт"
 );

l10n/ru_RU.php

@@ -2,6 +2,7 @@
 "Unsupported file type for import" => "Неподдерживаемый тип файла для импорта",
 "Bookmarks" => "Закладки",
 "Tags" => "Теги",
+"Filter by tag" => "Фильтрация по тегу",
 "Edit bookmark" => "Редактировать закладку",
 "Are you sure you want to remove this tag from every entry?" => "Вы уверены, что хотите удалить этот тег из каждой записи?",
 "Warning" => "Предупреждение",
@@ -14,24 +15,19 @@
 "The address of the page" => "Адрес страницы",
 "Description of the page" => "Описание страницы",
 "Save" => "Сохранить",
+"Delete" => "Удалить",
+"Edit" => "Редактировать",
+"Cancel" => "Отмена",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Перетащите это в закладки Вашего браузера и кликните на него, когда захотите быстро добавить страницу в закладки:",
 "Read later" => "Прочитать позже",
-"Edit" => "Редактировать",
-"Delete" => "Удалить",
-"Cancel" => "Отмена",
 "Address" => "Адрес",
-"Add bookmark" => "Добавить закладку",
+"Add" => "Добавить",
-"List" => "Список",
-"Image" => "Изображение",
-"Hide" => "Скрыть",
-"Show" => "Показать",
 "Related Tags" => "Связанные теги",
 "Settings" => "Настройки",
 "You have no bookmarks" => "У Вас нет закладок",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"You can also try to import a bookmark file" => "Вы также можете попытаться импортировать файл закладок",
-"Import bookmarks" => "Импорт закладок",
+"Bookmarklet" => "Bookmarklet",
-"html bookmarks file" => "файл html-закладок",
+"Export & Import" => "Экспорт & Импорт",
-"Import" => "Импортировать",
+"Export" => "Экспортировать",
-"Export bookmarks" => "Экспорт закладок",
+"Import" => "Импортировать"
-"Export" => "Экспортировать"
 );

l10n/si_LK.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "ආයාත කරන ගොනුව රුචි නොවේ",
 "Bookmarks" => "පිටු සළකුනු",
 "Tags" => "ටැග",
+"Filter by tag" => "ටැගය ආධාරයෙන් පෙරන්න",
 "Edit bookmark" => "පිටු සළකුනු සකසන්න",
 "Are you sure you want to remove this tag from every entry?" => "මෙම ටැගය සියළු ඇතුලත් කිරීමකින් ඉවත් කරන බව ඔබට සහතිකද",
 "Warning" => "අනතුරු ඇඟවිම",
+"Import completed successfully." => "ආයාත කිරීම සාර්ථකයි",
+"Uploading..." => "උඩුගත කෙරේ...",
 "Bookm." => "පිටුසන",
 "Add a bookmark" => "පිටු සළකුනක් එක් කරන්න",
 "Close" => "වසන්න",
@@ -11,23 +15,18 @@
 "The address of the page" => "පිටුවේ ලිපිනය",
 "Description of the page" => "පිටුවේ විස්තර",
 "Save" => "සුරකින්න",
+"Delete" => "මකන්න",
+"Edit" => "සකසන්න",
+"Cancel" => "එපා",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "මෙම වෙබ් පිටුව ඉක්මනින් පිටු සළකුනක් ලෙස සටහන් කිරීමට, එය බ්‍රවුසරයේ පිටු සළකුනු මතට ඇද ක්ලික් කරන්න:",
 "Read later" => "පසුව කියවීමට",
-"Edit" => "සකසන්න",
-"Delete" => "මකන්න",
-"Cancel" => "එපා",
 "Address" => "ලිපිනය",
-"Add bookmark" => "පිටුසන එකතුකරන්න",
+"Add" => "එකතු කරන්න",
-"List" => "ලයිස්තුව",
-"Image" => "පින්තූරය",
-"Hide" => "සඟවන්න",
-"Show" => "පෙන්වන්න",
 "Related Tags" => "අදාළ ටැගයන්",
 "Settings" => "සිටුවම්",
 "You have no bookmarks" => "පිටු සළකුනු නොමැත",
-"Bookmarklet <br />" => "පිටුසන<br />",
+"You can also try to import a bookmark file" => "පිටුසන අඩංගු ගොනුවක් ආයාත කිරීමට උත්සහ කළ හැක",
-"Import bookmarks" => "පිටුසනයන් ආයාත කරන්න",
+"Export & Import" => "ආයාත හා නිර්යාත",
-"Import" => "ආයාත කරන්න",
+"Export" => "නිර්යාත කරන්න",
-"Export bookmarks" => "පිටුසනයන් නිර්යාත කරන්න",
+"Import" => "ආයාත කරන්න"
-"Export" => "නිර්යාත කරන්න"
 );

l10n/sk_SK.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Nepodporovaný typ súboru pre import",
 "Bookmarks" => "Záložky",
 "Tags" => "Značky",
+"Filter by tag" => "Filtrovať podľa značky",
 "Edit bookmark" => "Upraviť záložku",
 "Are you sure you want to remove this tag from every entry?" => "Naozaj ste si istý, že chcete odstrániť túto značku z každého záznamu?",
 "Warning" => "Varovanie",
+"Import completed successfully." => "Import prebehol úspešne.",
+"Uploading..." => "Odosielanie...",
 "Bookm." => "Zál.",
 "Add a bookmark" => "Pridať záložku",
 "Close" => "Zavrieť",
@@ -11,23 +15,19 @@
 "The address of the page" => "Adresa stránky",
 "Description of the page" => "Popis stránky",
 "Save" => "Uložiť",
+"Delete" => "Zmazať",
+"Edit" => "Upraviť",
+"Cancel" => "Zrušiť",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Presuňte toto do vášho prehliadača a kliknite ak chcete aktuálnu stránku uložiť do záložiek.",
 "Read later" => "Prečítať neskôr",
-"Edit" => "Upraviť",
-"Delete" => "Zmazať",
-"Cancel" => "Zrušiť",
 "Address" => "Adresa",
-"Add bookmark" => "Pridať záložku",
+"Add" => "Pridať",
-"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",
-"Bookmarklet <br />" => "Záložky <br />",
+"You can also try to import a bookmark file" => "Môžte tiež skúsiť import súboru zo záložkami.",
-"Import bookmarks" => "Importovať záložky",
+"Bookmarklet" => "Bookmarklet",
-"Import" => "Import",
+"Export & Import" => "Export & Import",
-"Export bookmarks" => "Export záložiek",
+"Export" => "Export",
-"Export" => "Export"
+"Import" => "Import"
 );

l10n/sl.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Vrsta datoteke ni podprta za uvoz",
 "Bookmarks" => "Zaznamki",
 "Tags" => "Oznake",
+"Filter by tag" => "Razvrsti po značkah",
 "Edit bookmark" => "Uredi zaznamke",
 "Are you sure you want to remove this tag from every entry?" => "Ali res želite odstraniti te oznake iz vsakega vnosa?",
 "Warning" => "Opozorilo",
+"Import completed successfully." => "Uvoz je uspešno zaključen.",
+"Uploading..." => "Nalagam ...",
 "Bookm." => "Zaznam.",
 "Add a bookmark" => "Dodaj zaznamek",
 "Close" => "Zapri",
@@ -11,23 +15,19 @@
 "The address of the page" => "Naslov strani",
 "Description of the page" => "Opis strani",
 "Save" => "Shrani",
+"Delete" => "Izbriši",
+"Edit" => "Uredi",
+"Cancel" => "Prekliči",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Povlecite gumb med svoje zaznamke in kliknite nanj, ko želite obiskano spletno stran hitro dodati med svoje zaznamke:",
 "Read later" => "Preberi kasneje",
-"Edit" => "Uredi",
-"Delete" => "Izbriši",
-"Cancel" => "Prekliči",
 "Address" => "Naslov",
-"Add bookmark" => "Dodaj zaznamek",
+"Add" => "Dodaj",
-"List" => "znam",
-"Image" => "Slika",
-"Hide" => "Skrij",
-"Show" => "Pokaži",
 "Related Tags" => "Sorodne oznake",
 "Settings" => "Nastavitve",
 "You have no bookmarks" => "Nimate zaznamkov",
-"Bookmarklet <br />" => "Vstavek za zaznamke <br />",
+"You can also try to import a bookmark file" => "Prav tako lahko poskusite uvoziti datoteko z zaznamki",
-"Import bookmarks" => "Uvozi zaznamke",
+"Bookmarklet" => "Vstavek za zaznamke",
-"Import" => "Uvozi",
+"Export & Import" => "Izvoz & uvoz",
-"Export bookmarks" => "Izvozi zaznamke",
+"Export" => "Izvozi",
-"Export" => "Izvozi"
+"Import" => "Uvozi"
 );

l10n/sr.php

@@ -1,10 +1,33 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Неподржана врста датотеке за увоз",
+"Bookmarks" => "Обележивачи",
+"Tags" => "Ознаке",
+"Filter by tag" => "Филтрирај по ознаци",
+"Edit bookmark" => "Промени обележивач",
+"Are you sure you want to remove this tag from every entry?" => "Да ли сигурно желите да уклоните ову ознаку из сваког уноса?",
+"Warning" => "Упозорење",
+"Import completed successfully." => "Увоз је успешан.",
+"Uploading..." => "Отпремам...",
+"Bookm." => "Обеле.",
+"Add a bookmark" => "Додај обележивач",
 "Close" => "Затвори",
+"The title of the page" => "Наслов странице",
+"The address of the page" => "Адреса странице",
+"Description of the page" => "Опис странице",
 "Save" => "Сними",
-"Edit" => "Уреди",
 "Delete" => "Обриши",
+"Edit" => "Уреди",
 "Cancel" => "Откажи",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Превуците ово у ваш прегледач и кликните уколико желите да обележите ову веб страницу на брзину:",
+"Read later" => "Прочитаћу касније",
 "Address" => "Адреса",
-"List" => "Списак",
+"Add" => "Додај",
-"Settings" => "Подешавања"
+"Related Tags" => "Повезане ознаке",
+"Settings" => "Подешавања",
+"You have no bookmarks" => "Немате обележиваче",
+"You can also try to import a bookmark file" => "Можете такође пробати са увозом датотеке са обележивачима",
+"Bookmarklet" => "Маркер",
+"Export & Import" => "Извоз и увоз",
+"Export" => "Извези",
+"Import" => "Увези"
 );

l10n/sr@latin.php

@@ -1,10 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Close" => "Zatvori",
 "Save" => "Snimi",
-"Edit" => "Uredi",
 "Delete" => "Obriši",
+"Edit" => "Uredi",
 "Cancel" => "Otkaži",
 "Address" => "Adresa",
-"List" => "Spisak",
 "Settings" => "Podešavanja"
 );

l10n/sv.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Filtypen stöds ej för import",
 "Bookmarks" => "Bokmärken",
 "Tags" => "Taggar",
+"Filter by tag" => "Filtrera på etikett",
 "Edit bookmark" => "Redigera bokmärke",
 "Are you sure you want to remove this tag from every entry?" => "Är du säker på att du vill ta bort denna tagg från varje post?",
 "Warning" => "Varning",
+"Import completed successfully." => "Import slutförd.",
+"Uploading..." => "Laddar upp...",
 "Bookm." => "Bokm.",
 "Add a bookmark" => "Lägg till ett bokmärke",
 "Close" => "Stäng",
@@ -11,23 +15,19 @@
 "The address of the page" => "Adress till sidan",
 "Description of the page" => "Beskrivning av sidan",
 "Save" => "Spara",
+"Delete" => "Radera",
+"Edit" => "Redigera",
+"Cancel" => "Avbryt",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Dra till din webbläsares bokmärken och klicka på det när du vill bokmärka en webbsida snabbt:",
 "Read later" => "Läs senare",
-"Edit" => "Redigera",
-"Delete" => "Radera",
-"Cancel" => "Avbryt",
 "Address" => "Adress",
-"Add bookmark" => "Lägg till bokmärke",
+"Add" => "Lägg till",
-"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",
-"Bookmarklet <br />" => "Skriptbokmärke <br />",
+"You can also try to import a bookmark file" => "Du kan också försöka att importera en bokmärkesfil",
-"Import bookmarks" => "Importera bokmärken",
+"Bookmarklet" => "Bokmärke",
-"Import" => "Importera",
+"Export & Import" => "Export & Import",
-"Export bookmarks" => "Exportera bokmärken",
+"Export" => "Exportera",
-"Export" => "Exportera"
+"Import" => "Importera"
 );

l10n/ta_LK.php

@@ -1,13 +1,33 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "இறக்குமதிக்கு ஆதரவளிக்காத கோப்பு வகை",
 "Bookmarks" => "பக்க அடையாளங்கள்",
+"Tags" => "சீட்டுகள்",
+"Filter by tag" => "சீட்டுகளால் வடிகட்டுக",
+"Edit bookmark" => "பக்க அடையாளத் தொகுக்க ",
+"Are you sure you want to remove this tag from every entry?" => "ஒவ்வொரு நுழைவின் போதும் இந்த சீட்டை கட்டாயம் அகற்ற வேண்டுமா?",
 "Warning" => "எச்சரிக்கை",
+"Import completed successfully." => "இறக்குமதி வெற்றிகரமாக நிறைவேற்றப்பட்டது.",
+"Uploading..." => "பதிவேற்றல்...",
+"Bookm." => "பக்க அடையாளங்கள்",
+"Add a bookmark" => "பக்க அடையாளம் ஒன்றை சேர்க்க",
 "Close" => "மூடுக",
+"The title of the page" => "பக்கத்தி்ன் தலைப்பு",
+"The address of the page" => "பக்கத்தின் முகவரி",
+"Description of the page" => "பக்கத்தின் விவரிப்பு",
 "Save" => "சேமிக்க",
-"Edit" => "தொகுக்க",
 "Delete" => "அழிக்க",
+"Edit" => "தொகுக்க",
 "Cancel" => "இரத்து செய்க",
-"List" => "பட்டியல்",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "உங்களுக்கு ஒரு வலைய பக்கத்தை விரைவாக பக்க அடையாளப்படுத்துவதற்கு அதை உங்களுடைய உலாவியின் பக்க அடையாளங்களில் இழுத்து விட்டு சொடக்குக",
+"Read later" => "பிறகு வாசிக்க",
+"Address" => "முகவரி",
+"Add" => "சேர்க்க",
+"Related Tags" => "தொடர்புபட்ட சீட்டுகள்",
 "Settings" => "அமைப்புகள்",
-"Import" => "இறக்குமதி",
+"You have no bookmarks" => "உங்களிடம் பக்க அடையாளங்கள் இல்லை ",
-"Export" => "ஏற்றுமதி"
+"You can also try to import a bookmark file" => "நீங்களும் ஒரு பக்க அடையாள கோப்பை இறக்குமதி செய்ய முயற்சிக்கலாம்",
+"Bookmarklet" => "பக்க அடையாளங்கள்",
+"Export & Import" => "ஏற்றுமதி மற்றும் இறக்குமதி",
+"Export" => "ஏற்றுமதி",
+"Import" => "இறக்குமதி"
 );

l10n/th_TH.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "ประเภทของไฟล์ที่ต้องการนำเข้าไม่ได้รับการรองรับให้ใช้งาน",
 "Bookmarks" => "รายการโปรด",
 "Tags" => "ป้ายกำกับ",
+"Filter by tag" => "แสดงข้อมูลตามป้ายกำกับ",
 "Edit bookmark" => "แก้ไขรายการโปรด",
 "Are you sure you want to remove this tag from every entry?" => "คุณแน่ใจแล้วหรือว่าต้องการลบป้ายกำกับนี้ออกจากทุกๆรายการ",
 "Warning" => "คำเตือน",
+"Import completed successfully." => "นำเข้าข้อมูลเสร็จเรียบร้อยแล้ว",
+"Uploading..." => "กำลังอัพโหลด...",
 "Bookm." => "รายการโปรด",
 "Add a bookmark" => "เพิ่มรายการโปรด",
 "Close" => "ปิด",
@@ -11,23 +15,19 @@
 "The address of the page" => "ที่อยู่ของหน้า",
 "Description of the page" => "คำอธิบายเกี่ยวกับหน้า",
 "Save" => "บันทึก",
+"Delete" => "ลบ",
+"Edit" => "แก้ไข",
+"Cancel" => "ยกเลิก",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "ลากสิ่งนี้ไปไว้ที่รายการโปรดในโปรแกรมบราวเซอร์ของคุณ แล้วคลิกที่นั่น, เมื่อคุณต้องการเก็บหน้าเว็บเพจเข้าไปไว้ในรายการโปรดอย่างรวดเร็ว",
 "Read later" => "อ่านภายหลัง",
-"Edit" => "แก้ไข",
-"Delete" => "ลบ",
-"Cancel" => "ยกเลิก",
 "Address" => "ที่อยู่",
-"Add bookmark" => "เพิ่มรายการโปรด",
+"Add" => "เพิ่ม",
-"List" => "รายการ",
-"Image" => "รูปภาพ",
-"Hide" => "ซ๋อน",
-"Show" => "แสดง",
 "Related Tags" => "ป้ายกำกับอื่นๆที่เกี่ยวข้อง",
 "Settings" => "ตั้งค่า",
 "You have no bookmarks" => "คุณยังไม่มีรายการโปรด",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"You can also try to import a bookmark file" => "คุณสามารถที่จะลองนำเข้าไฟล์รายการโปรดได้ด้วยเช่นกัน",
-"Import bookmarks" => "นำเข้ารายการโปรด",
+"Bookmarklet" => "Bookmarklet",
-"Import" => "นำเข้า",
+"Export & Import" => "ส่งออก & นำเข้า",
-"Export bookmarks" => "ส่งออกรายการโปรด",
+"Export" => "ส่งออก",
-"Export" => "ส่งออก"
+"Import" => "นำเข้า"
 );

l10n/tr.php

@@ -4,15 +4,13 @@
 "Warning" => "Uyarı",
 "Close" => "Kapat",
 "Save" => "Kaydet",
-"Read later" => "Sonra oku",
-"Edit" => "Düzenle",
 "Delete" => "Sil",
+"Edit" => "Düzenle",
 "Cancel" => "İptal",
+"Read later" => "Sonra oku",
 "Address" => "Adres",
-"List" => "Liste",
+"Add" => "Ekle",
-"Hide" => "Gizle",
-"Show" => "Göster",
 "Settings" => "Ayarlar",
-"Import" => "İçe aktar",
+"Export" => "Dışa aktar",
-"Export" => "Dışa aktar"
+"Import" => "İçe aktar"
 );

l10n/uk.php

@@ -1,16 +1,33 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Імпорт файлу даного типу не підтримується",
 "Bookmarks" => "Закладки",
 "Tags" => "Теги",
+"Filter by tag" => "Фільтр по тегах",
+"Edit bookmark" => "Редагувати закладку",
+"Are you sure you want to remove this tag from every entry?" => "Ви впевнені, що бажаєте видалити цей тег з кожного запису ?",
+"Warning" => "Попередження",
+"Import completed successfully." => "Імпорт завершено успішно.",
+"Uploading..." => "Вивантаження...",
+"Bookm." => "Заклд.",
+"Add a bookmark" => "Додати закладку",
 "Close" => "Закрити",
+"The title of the page" => "Заголовок сторінки",
+"The address of the page" => "Адреса сторінки",
+"Description of the page" => "Опис сторінки",
 "Save" => "Зберегти",
-"Read later" => "Прочитати пізніше",
-"Edit" => "Редагувати",
 "Delete" => "Видалити",
+"Edit" => "Редагувати",
 "Cancel" => "Відмінити",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Перетягніть це в закладки вашого броузера і клікніть для того, щоб швидко закласти web-сторінку:",
+"Read later" => "Прочитати пізніше",
 "Address" => "Адреса",
-"List" => "Список",
+"Add" => "Додати",
+"Related Tags" => "Пов'язані теги",
 "Settings" => "Налаштування",
-"You have no bookmarks" => "У вас нема закладок",
+"You have no bookmarks" => "У вас немає закладок",
-"Import" => "Імпорт",
+"You can also try to import a bookmark file" => "Ви можете також спробувати імпортувати файл закладок",
-"Export" => "Експорт"
+"Bookmarklet" => "Закладка-аплет",
+"Export & Import" => "Експорт та Імпорт",
+"Export" => "Експорт",
+"Import" => "Імпорт"
 );

l10n/vi.php

@@ -1,18 +1,33 @@
 <?php $TRANSLATIONS = array(
-"Bookmarks" => "Đánh dấu",
+"Unsupported file type for import" => "Loại tập tin không được hỗ trợ để nhập vào",
+"Bookmarks" => "Bookmarks",
 "Tags" => "Tags",
+"Filter by tag" => "Lọc theo tag",
+"Edit bookmark" => "Sửa bookmark",
+"Are you sure you want to remove this tag from every entry?" => "Bạn có chắc chắn bạn muốn loại bỏ tags này ?",
+"Warning" => "Cảnh báo",
+"Import completed successfully." => "Nhập vào thành công",
+"Uploading..." => "tải lên...",
+"Bookm." => "Bookm.",
+"Add a bookmark" => " Thêm bookmark",
 "Close" => "Đóng",
+"The title of the page" => "Tiêu đề trang",
+"The address of the page" => "Địa chỉ trang",
+"Description of the page" => "Mô tả trang",
 "Save" => "Lưu",
+"Delete" => "Xóa",
+"Edit" => "Sửa",
+"Cancel" => "Hủy",
 "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:",
 "Read later" => "Đọc sau",
-"Edit" => "Sửa",
-"Delete" => "Xóa",
-"Cancel" => "Hủy",
 "Address" => "Địa chỉ",
-"List" => "Danh sách",
+"Add" => "Thêm",
-"Settings" => "Tùy chỉnh",
+"Related Tags" => "Những Tag có liên quan",
-"You have no bookmarks" => "Bạn chưa có đánh dấu nào",
+"Settings" => "Cài đặt",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"You have no bookmarks" => "Bạn chưa có bookmark nào",
-"Import" => "Nhập",
+"You can also try to import a bookmark file" => "Bạn cũng có thể thử nhập vào một tập tin bookmark",
-"Export" => "Xuất"
+"Bookmarklet" => "Bookmarklet",
+"Export & Import" => "Xuất ra & Nhập vào",
+"Export" => "Xuất ra",
+"Import" => "Nhập vào"
 );

l10n/zh_CN.GB2312.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "不支持导入的文件类型",
 "Bookmarks" => "书签",
 "Tags" => "标签",
+"Filter by tag" => "按标签过滤",
 "Edit bookmark" => "编辑书签",
 "Are you sure you want to remove this tag from every entry?" => "您确定要从所有条目中移除此标签吗？",
 "Warning" => "警告",
+"Import completed successfully." => "导入完全成功。",
+"Uploading..." => "上传中...",
 "Bookm." => "订阅它们。",
 "Add a bookmark" => "添加书签",
 "Close" => "关闭",
@@ -11,23 +15,19 @@
 "The address of the page" => "页面地址",
 "Description of the page" => "页面描述",
 "Save" => "保存",
+"Delete" => "删除",
+"Edit" => "编辑",
+"Cancel" => "取消",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "拖动此物到您的浏览器书签栏，在您想要快速订阅某网页时点击：",
 "Read later" => "稍后阅读",
-"Edit" => "编辑",
-"Delete" => "删除",
-"Cancel" => "取消",
 "Address" => "网址",
-"Add bookmark" => "添加书签",
+"Add" => "添加",
-"List" => "列表",
-"Image" => "图片",
-"Hide" => "隐藏",
-"Show" => "显示",
 "Related Tags" => "相关标签",
 "Settings" => "设置",
 "You have no bookmarks" => "您没有书签",
-"Bookmarklet <br />" => "小书签 <br />",
+"You can also try to import a bookmark file" => "您也可以尝试导入一个书签文件",
-"Import bookmarks" => "导入书签",
+"Bookmarklet" => "书签",
-"Import" => "导入",
+"Export & Import" => "导出 & 导入",
-"Export bookmarks" => "导出书签",
+"Export" => "导出",
-"Export" => "导出"
+"Import" => "导入"
 );

l10n/zh_CN.php

@@ -1,9 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "不支持导入的文件类型",
 "Bookmarks" => "书签",
 "Tags" => "标签",
+"Filter by tag" => "按标签过滤",
 "Edit bookmark" => "编辑书签",
 "Are you sure you want to remove this tag from every entry?" => "确定要从所有条目中移除此标签？",
 "Warning" => "警告",
+"Import completed successfully." => "导入成功完成。",
+"Uploading..." => "上传中……",
 "Bookm." => "书签",
 "Add a bookmark" => "新增一个书签",
 "Close" => "关闭",
@@ -11,23 +15,19 @@
 "The address of the page" => "页面地址",
 "Description of the page" => "页面描述",
 "Save" => "保存",
+"Delete" => "删除",
+"Edit" => "编辑",
+"Cancel" => "取消",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "拖曳此处到您的浏览器书签处，点击可以将网页快速添加到书签中。",
 "Read later" => "稍后阅读",
-"Edit" => "编辑",
-"Delete" => "删除",
-"Cancel" => "取消",
 "Address" => "地址",
-"Add bookmark" => "新增书签",
+"Add" => "增加",
-"List" => "列表",
-"Image" => "图像",
-"Hide" => "隐藏",
-"Show" => "显示",
 "Related Tags" => "相关标签",
 "Settings" => "设置",
 "You have no bookmarks" => "您暂无书签",
-"Bookmarklet <br />" => "书签应用",
+"You can also try to import a bookmark file" => "您也可以尝试导入一个书签文件",
-"Import bookmarks" => "导入书签",
+"Bookmarklet" => "书签",
-"Import" => "导入",
+"Export & Import" => "导入导出",
-"Export bookmarks" => "导出书签",
+"Export" => "导出",
-"Export" => "导出"
+"Import" => "导入"
 );

l10n/zh_TW.php

@@ -1,18 +1,27 @@
 <?php $TRANSLATIONS = array(
 "Bookmarks" => "書籤",
 "Tags" => "標籤",
+"Filter by tag" => "依標籤篩選",
+"Edit bookmark" => "編輯書籤",
+"Warning" => "警告",
+"Uploading..." => "上傳中...",
+"Add a bookmark" => "新增書籤",
 "Close" => "關閉",
+"The title of the page" => "頁面標題",
+"Description of the page" => "頁面說明",
 "Save" => "儲存",
+"Delete" => "刪除",
+"Edit" => "編輯",
+"Cancel" => "取消",
 "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "將此拖曳至您的瀏覽器書籤並點擊, 當你想要將網頁快速地加入書籤:",
 "Read later" => "稍後閱讀",
-"Edit" => "編輯",
-"Delete" => "刪除",
-"Cancel" => "取消",
 "Address" => "網址",
-"List" => "清單",
+"Add" => "新增",
+"Related Tags" => "相關標籤",
 "Settings" => "設定",
 "You have no bookmarks" => "你沒有書籤",
-"Bookmarklet <br />" => "書籤小工具",
+"You can also try to import a bookmark file" => "您也可以匯入書籤檔",
-"Import" => "匯入",
+"Export & Import" => "匯出與匯入",
-"Export" => "匯出"
+"Export" => "匯出",
+"Import" => "匯入"
 );

settings.php

@@ -1,12 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Marvin Thomas Rabe <mrabe@marvinrabe.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-OCP\App::checkAppEnabled('bookmarks');
-
-$tmpl = new OCP\Template('bookmarks', 'settings');
-$tmpl->printPage();

templates/bookmarklet.php

@@ -1,8 +0,0 @@
-<?php
-
-function createBookmarklet() {
-	$l = OC_L10N::get('bookmarks');
-	echo '<small>' . $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(\'' . 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);})();">'
-	. $l->t('Read later') . '</a>';
-} 

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');?>">
@@ -14,14 +10,15 @@
 					<a href="<%= encodeEntities(url) %>" target="_blank" class="bookmark_link">
 						<%= encodeEntities(title == '' ? url : title ) %>
 					</a>
+                                    	<span class="bookmark_desc"><%= encodeEntities(description)%> </span>
+                                        <span class="bookmark_date"><%= formatDate(added_date) %></span>
 				</p>
-				<p class="bookmark_url">
+                                <div class="bookmark_edit_btn">
-					<a href="<%= encodeEntities(url) %>" target="_blank" class="bookmark_link">
+                                        <span class="bookmark_edit">
-						<%= encodeEntities(url) %>
+						<img class="svg" src="<?php echo OCP\image_path("", "actions/rename.svg");?>"
-					</a>
+							title="<?php echo $l->t('Edit');?>">
-				</p>
+					</span>
-				<p class="bookmark_date"><%= formatDate(added_date) %></p>
+                                </div>
-				<p class="bookmark_desc"><%= encodeEntities(description)%> </p>
 			</div>
 </script>
 
@@ -67,24 +64,3 @@
 		<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>

templates/list.php

@@ -6,61 +6,61 @@
  * 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>
+	<form id="add_form">
-		<span class="right_img"> <?php echo $l->t('Show')?> &gt;&gt;</span>
+		<input type="text" id="add_url" value="" placeholder="<?php echo $l->t('Address'); ?>"/>
-	</div>
+		<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>
+	<input type="hidden" id="bookmarkFilterTag" value="<?php echo $_['req_tag']; ?>" />
 
 	<label><?php echo $l->t('Related Tags'); ?></label>
 	<ul class="tag_list">
 	</ul>
 
 
-<div id="bookmark_settings">
+<div id="bookmark_settings" class="">
-		<ul class="controls">
+	<ul class="controls">
-			<li style="float: right">
+		<li style="float: right">
-				<button id="settingsbtn" title="<?php echo $l->t('Settings'); ?>">
+			<button id="settingsbtn" title="<?php echo $l->t('Settings'); ?>">
-					<img class="svg" src="<?php echo OCP\Util::imagePath('core', 'actions/settings.png'); ?>"
+				<img class="svg" src="<?php echo OCP\Util::imagePath('core', 'actions/settings.png'); ?>"
-					alt="<?php echo $l->t('Settings'); ?>"   /></button>
+				alt="<?php echo $l->t('Settings'); ?>"   /></button>
-			</li>
+		</li>
-		</ul>
+	</ul>
+	<div id="bm_setting_panel">
+		<?php require 'settings.php';?>
 	</div>
+</div>
 
 </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(); 
+			echo bookmarklet();?><br/><br />
-		?>
+
-	<div id="appsettings" class="popup bottomleft hidden"></div>
+			<small><a href="#" id="firstrun_setting"><?php echo $l->t('You can also try to import a bookmark file');?></a></small>
+	</div>
+	<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">

templates/settings.php

@@ -8,11 +8,8 @@
 ?>
 
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Bookmarklet <br />');?></strong></legend>
+	<legend><strong><?php echo $l->t('Bookmarklet');?></strong></legend>
-	<?php
+	<?php echo bookmarklet();?><br />
-			require_once 'bookmarklet.php';
-			createBookmarklet();
-	?>
 </fieldset>
 
 <form id="import_bookmark" action="<?php echo OCP\Util::linkTo( "bookmarks", "ajax/import.php" );?>"
@@ -23,16 +20,13 @@
 			<p><?php echo $_['error']['hint']; ?></p>
 		<?php endif; ?>
 
-			<legend><strong><?php echo $l->t('Import bookmarks');?></strong></legend>
+			<legend><strong><?php echo $l->t('Export & Import');?></strong></legend>
-			<p><input type="file" id="bm_import" name="bm_import" style="width:280px;">
+			<input type="button" id="bm_export" href="<?php echo OCP\Util::linkTo('bookmarks', 'export.php') ;?>" value="<?php echo $l->t('Export'); ?>" />
-				<label for="bm_import"> <?php echo $l->t('html bookmarks file');?></label>
+			<input type="file" id="bm_import" name="bm_import" size="5">
-			</p>
+			<button type="button" name="bm_import_btn" id="bm_import_submit"><?php echo $l->t('Import'); ?></button>
-			<input type="button" name="bm_import_btn" id="bm_import_submit" value="<?php echo $l->t('Import'); ?>" />
+			<div id="upload"></div>
-		<div id="upload"></div>
+
 
-		<legend><strong><?php echo $l->t('Export bookmarks');?></strong></legend>
-		<p><a href="<?php echo OCP\Util::linkTo('bookmarks', 'export.php') ;?>"
-			class="button"><?php echo $l->t('Export'); ?></a></p>
 		
 	</fieldset>
 </form>