Merge branch 'master' into gallery

css/bookmarks.css

@@ -5,9 +5,7 @@
 #firstrun #selections { font-size:0.8em;  font-weight: normal; width: 100%; margin: 2em auto auto auto; clear: both; }
 
 #leftcontent {
-/*     margin: 0; */
     padding-top: 1em;
-/*     top: 3.5em !important; */
 }
 
 #rightcontent {
@@ -22,7 +20,6 @@
 	border: 1px solid lightgray;
 	border-right:0;
   border-radius: 0.5em 0em 0em 0.5em;
-/* 	margin-right: 10px; */
   padding: 3px;
 }
 
@@ -46,8 +43,6 @@
 	overflow: auto;
 	position: fixed;
 	top: 6.5em;
-/* 	margin-left: 15px; */
-
 }
 
 #add_url {
@@ -156,11 +151,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 +171,6 @@
 
 }
 
-.ui-autocomplete {
-/* 	background: none repeat scroll 0 0 #DEE7F8; */
-}
-
 #leftcontent > ul > li, .leftcontent li {
 	padding: 0.2em;
 	padding-left:1em;
@@ -199,8 +188,6 @@
     border-radius: 6px 6px 6px 6px;
     color: #555555;
     font-weight: normal;
-		
-/* 		padding: 0.2em 18px 0.2em 0.5em; */
 		float:left;
 		padding: 0.3em;
     position: relative;
@@ -236,7 +223,6 @@ li:hover em { display : none; }
 #tag_filter ul.tagit li.tagit-choice {
     background: none repeat scroll 0 0 #DEE7F8;
 		padding: 0.2em 18px 0.2em 0.5em;
-/* 		padding:0; */
 }
 
 #tag_filter a {
@@ -268,8 +254,6 @@ li:hover em { display : none; }
 	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);
 }
@@ -349,6 +333,7 @@ li:hover em { display : none; }
     width: 20em;
     z-index: 2;
 }
+
 #leftcontent #bookmark_settings li{
 	padding: 0;
 	background-color:transparent;
@@ -358,16 +343,43 @@ li:hover em { display : none; }
 }
 
 #bookmark_settings .controls {
-    height: 100%;
+    height: 2.8em;
     width: 100%;
 }
 
 #bookmark_settings .controls > li:last-child button {
     margin-right: 0.3em;
 }
-#bookmark_settings button {
+#bookmark_settings .controls button {
     height: 2.4em;
     margin: 0.15em 0 0 0.15em;
     padding: 0.2em 0.1em 0;
     width: 2.4em;
+}
+
+#bookmark_settings.open {
+	height: 300px;
+}
+#bm_setting_panel {
+	background-color: white;
+	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;
 }

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

js/bookmarks.js

@@ -9,13 +9,13 @@ $(document).ready(function() {
 	$('.centercontent').click(clickSideBar);
 	$('#view_type input').click(clickSwitchView);
 	$('#bookmark_add_submit').click(addBookmark);
+
+// 	$('#bm_import_submit').click(attachSettingEvent);
+	$('#bm_import').change(attachSettingEvent);
   $('#settingsbtn').on('click keydown', function() {
-		try {
+		$('#bookmark_settings').toggleClass('open');
-			OC.appSettings({appid:'bookmarks', loadJS:true, cache:false});
-		} catch(e) {
-			alert(e);
-		}
 	});
+	$('#bm_export').click(exportBm);
 
 	$(window).resize(function () {
 		fillWindow($('.bookmarks_list'));

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

@@ -7,6 +7,6 @@
 "Address" => "عنوان",
 "List" => "قائمة",
 "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" => "Отказ",
 "Address" => "Адрес",
 "List" => "Списък",
 "You have no bookmarks" => "Нямате отметки",
-"Bookmarklet <br />" => "Бутон за отметки <br />",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Завлачете това в лентата с отметки на браузъра си и го натискайте, когато искате да отметнете бързо някоя страница:",
-"Import" => "Внасяне",
+"Read later" => "Отмятане",
-"Export" => "Изнасяне"
+"Export" => "Изнасяне",
+"Import" => "Внасяне"
 );

l10n/ca.php

@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Importació d'un tipus de fitxer no implementat",
 "Bookmarks" => "Adreces d'interès",
 "Tags" => "Etiquetes",
 "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,8 +14,6 @@
 "The address of the page" => "L'adreça de la pàgina",
 "Description of the page" => "Descripció de la pàgina",
 "Save" => "Desa",
-"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",
@@ -25,9 +26,8 @@
 "Related Tags" => "Etiquetes relacionades",
 "Settings" => "Configuració",
 "You have no bookmarks" => "No teniu adreces d'interès",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"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:",
-"Import bookmarks" => "Importa les adreces d'interès",
+"Read later" => "Llegeix més tard",
-"Import" => "Importa",
+"Export" => "Exporta",
-"Export bookmarks" => "Exporta adreces d'interès",
+"Import" => "Importa"
-"Export" => "Exporta"
 );

l10n/cs_CZ.php

@@ -14,8 +14,6 @@
 "The address of the page" => "Adresa stránky",
 "Description of the page" => "Popis stránky",
 "Save" => "Ulož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",
@@ -28,10 +26,8 @@
 "Related Tags" => "Podobné značky",
 "Settings" => "Nastavení",
 "You have no bookmarks" => "Nemáte žádné záložky",
-"Bookmarklet <br />" => "Záložky <br />",
+"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:",
-"Import bookmarks" => "Importovat záložky",
+"Read later" => "Přečíst později",
-"html bookmarks file" => "soubor záložek html",
+"Export" => "Exportovat",
-"Import" => "Importovat",
+"Import" => "Importovat"
-"Export bookmarks" => "Exportovat záložky",
-"Export" => "Exportovat"
 );

l10n/da.php

@@ -11,8 +11,6 @@
 "The address of the page" => "Sidens adresse",
 "Description of the page" => "Sidens beskrivelse",
 "Save" => "Gem",
-"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",
@@ -25,9 +23,8 @@
 "Related Tags" => "Relaterede Tags",
 "Settings" => "Indstillinger",
 "You have no bookmarks" => "Du har ingen bogmærker",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"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:",
-"Import bookmarks" => "Importer bogmærker",
+"Read later" => "Læs senere",
-"Import" => "Importer",
+"Export" => "Exporter",
-"Export bookmarks" => "Exporter bogmærker",
+"Import" => "Importer"
-"Export" => "Exporter"
 );

l10n/de.php

@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Dateityp wird für den Import nicht unterstützt",
 "Bookmarks" => "Lesezeichen",
 "Tags" => "Tags",
 "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,8 +14,6 @@
 "The address of the page" => "Die Adresse der Seite",
 "Description of the page" => "Die Beschreibung der Seite",
 "Save" => "Speichern",
-"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",
@@ -25,9 +26,8 @@
 "Related Tags" => "Verwandte Schlagworte",
 "Settings" => "Einstellungen",
 "You have no bookmarks" => "Du hast keine Lesezeichen",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"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.",
-"Import bookmarks" => "Lesezeichen importieren",
+"Read later" => "Später lesen",
-"Import" => "Importieren",
+"Export" => "Exportieren",
-"Export bookmarks" => "Lesezeichen exportieren",
+"Import" => "Importieren"
-"Export" => "Exportieren"
 );

l10n/de_DE.php

@@ -14,8 +14,6 @@
 "The address of the page" => "Die Adresse der Seite",
 "Description of the page" => "Die Beschreibung der Seite",
 "Save" => "Speichern",
-"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",
@@ -28,10 +26,8 @@
 "Related Tags" => "Verwandte Schlagworte",
 "Settings" => "Einstellungen",
 "You have no bookmarks" => "Sie haben keine Lesezeichen",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"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.",
-"Import bookmarks" => "Lesezeichen importieren",
+"Read later" => "Später lesen",
-"html bookmarks file" => "HTML-Lesezeichen-Datei",
+"Export" => "Exportieren",
-"Import" => "Importieren",
+"Import" => "Importieren"
-"Export bookmarks" => "Lesezeichen exportieren",
-"Export" => "Exportieren"
 );

l10n/el.php

@@ -11,8 +11,6 @@
 "The address of the page" => "Διεύθυνση της σελίδας",
 "Description of the page" => "Περιγραφή της σελίδας",
 "Save" => "Αποθήκευση",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Σύρετε αυτό στους σελιδοδείκτες του περιηγητή σας και κάντε κλικ επάνω του, όταν θέλετε να προσθέσετε σύντομα μια ιστοσελίδα ως σελιδοδείκτη:",
-"Read later" => "Ανάγνωση αργότερα",
 "Edit" => "Επεξεργασία",
 "Delete" => "Διαγραφή",
 "Cancel" => "Ακύρωση",
@@ -25,9 +23,8 @@
 "Related Tags" => "Σχετικές ετικέτες",
 "Settings" => "Ρυθμίσεις",
 "You have no bookmarks" => "Δεν έχετε σελιδοδείκτες",
-"Bookmarklet <br />" => "Εφαρμογίδιο Σελιδοδεικτών <br />",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Σύρετε αυτό στους σελιδοδείκτες του περιηγητή σας και κάντε κλικ επάνω του, όταν θέλετε να προσθέσετε σύντομα μια ιστοσελίδα ως σελιδοδείκτη:",
-"Import bookmarks" => "Εισαγωγή σελιδοδεικτών",
+"Read later" => "Ανάγνωση αργότερα",
-"Import" => "Εισαγωγή",
+"Export" => "Εξαγωγή",
-"Export bookmarks" => "Εξαγωγή σελιδοδεικτών",
+"Import" => "Εισαγωγή"
-"Export" => "Εξαγωγή"
 );

l10n/eo.php

@@ -11,8 +11,6 @@
 "The address of the page" => "Adreso de la paĝo",
 "Description of the page" => "Priskribo de la paĝo",
 "Save" => "Konservi",
-"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",
@@ -25,9 +23,8 @@
 "Related Tags" => "Rilataj etikedoj",
 "Settings" => "Agordo",
 "You have no bookmarks" => "Vi havas neniun legosignon",
-"Bookmarklet <br />" => "Kodosigno <br />",
+"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:",
-"Import bookmarks" => "Enporti legosignojn",
+"Read later" => "Legi poste",
-"Import" => "Enporti",
+"Export" => "Elporti",
-"Export bookmarks" => "Elporti legosignojn",
+"Import" => "Enporti"
-"Export" => "Elporti"
 );

l10n/es.php

@@ -1,10 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Tipo de archivo no compatible para importar",
 "Bookmarks" => "Marcadores",
 "Tags" => "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,8 +14,6 @@
 "The address of the page" => "Direccion de la pagina",
 "Description of the page" => "Descripcion de la pagina",
 "Save" => "Guardar",
-"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",
@@ -26,9 +26,8 @@
 "Related Tags" => "Tags relacionados",
 "Settings" => "Ajustes",
 "You have no bookmarks" => "No tienes marcadores",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"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:",
-"Import bookmarks" => "Importar marcadores",
+"Read later" => "Leer después",
-"Import" => "Importart",
+"Export" => "Exportar",
-"Export bookmarks" => "Exportar marcadores",
+"Import" => "Importart"
-"Export" => "Exportar"
 );

l10n/es_AR.php

@@ -14,8 +14,6 @@
 "The address of the page" => "La dirección de la página",
 "Description of the page" => "Descripción de la página",
 "Save" => "Guardar",
-"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",
@@ -28,10 +26,8 @@
 "Related Tags" => "Etiquetas relacionadas",
 "Settings" => "Configuración",
 "You have no bookmarks" => "No tenés marcadores",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"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:",
-"Import bookmarks" => "Importar marcadores",
+"Read later" => "Leer después",
-"html bookmarks file" => "Archivo de marcadores HTML",
+"Export" => "Exportar",
-"Import" => "Importar",
+"Import" => "Importar"
-"Export bookmarks" => "Exportar marcadores",
-"Export" => "Exportar"
 );

l10n/et_EE.php

@@ -11,8 +11,6 @@
 "The address of the page" => "Lehe aadress",
 "Description of the page" => "Lehe kirjeldus",
 "Save" => "Salvesta",
-"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",
@@ -25,9 +23,8 @@
 "Related Tags" => "Seotud sildid",
 "Settings" => "Seaded",
 "You have no bookmarks" => "Sul pole järjehoidjaid",
-"Bookmarklet <br />" => "Järjehoidja vidin <br />",
+"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:",
-"Import bookmarks" => "Impordi järjehoidjaid",
+"Read later" => "Loe hiljem",
-"Import" => "Impordi",
+"Export" => "Ekspordi",
-"Export bookmarks" => "Ekspordi järjehoidjaid",
+"Import" => "Impordi"
-"Export" => "Ekspordi"
 );

l10n/eu.php

@@ -11,8 +11,6 @@
 "The address of the page" => "Orriaren helbidea",
 "Description of the page" => "Orriaren deskribapena",
 "Save" => "Gorde",
-"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",
@@ -25,9 +23,8 @@
 "Related Tags" => "Erlazionatutako etiketak",
 "Settings" => "Ezarpenak",
 "You have no bookmarks" => "Ez duzu laster-markarik",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"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:",
-"Import bookmarks" => "Inportatu laster-markak",
+"Read later" => "Irakurri geroago",
-"Import" => "Inportatu",
+"Export" => "Exportatu",
-"Export bookmarks" => "Exportatu laster-markak",
+"Import" => "Inportatu"
-"Export" => "Exportatu"
 );

l10n/fa.php

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

l10n/fi_FI.php

@@ -11,8 +11,6 @@
 "The address of the page" => "Sivun osoite",
 "Description of the page" => "Sivun kuvaus",
 "Save" => "Tallenna",
-"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",
@@ -25,9 +23,8 @@
 "Related Tags" => "Vastaavanlaiset tunnisteet",
 "Settings" => "Asetukset",
 "You have no bookmarks" => "Sinulla ei ole kirjanmerkkejä",
-"Bookmarklet <br />" => "Kirjanmerkitsin <br />",
+"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:",
-"Import bookmarks" => "Tuo kirjanmerkkejä",
+"Read later" => "Lue myöhemmin",
-"Import" => "Tuo",
+"Export" => "Vie",
-"Export bookmarks" => "Vie kirjanmerkkejä",
+"Import" => "Tuo"
-"Export" => "Vie"
 );

l10n/fr.php

@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Type de fichier non supporté pour l'importation",
 "Bookmarks" => "Favoris",
 "Tags" => "Étiquettes",
 "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,8 +14,6 @@
 "The address of the page" => "L'adresse de la page",
 "Description of the page" => "Description de la page",
 "Save" => "Sauvegarder",
-"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",
@@ -25,9 +26,8 @@
 "Related Tags" => "Étiquettes similaires",
 "Settings" => "Paramètres",
 "You have no bookmarks" => "Vous n'avez aucun favori",
-"Bookmarklet <br />" => "Gestionnaire de favoris <br />",
+"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 :",
-"Import bookmarks" => "Importer des favoris",
+"Read later" => "Lire plus tard",
-"Import" => "Importer",
+"Export" => "Exporter",
-"Export bookmarks" => "Exporter les favoris",
+"Import" => "Importer"
-"Export" => "Exporter"
 );

l10n/gl.php

@@ -5,8 +5,6 @@
 "Bookm." => "Marcad.",
 "Close" => "Pechar",
 "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",
 "Cancel" => "Cancelar",
@@ -14,7 +12,8 @@
 "List" => "Lista",
 "Settings" => "Preferencias",
 "You have no bookmarks" => "Non ten marcadores",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"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:",
-"Import" => "Importar",
+"Read later" => "Ler máis tarde",
-"Export" => "Exportar"
+"Export" => "Exportar",
+"Import" => "Importar"
 );

l10n/he.php

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

l10n/hr.php

@@ -8,6 +8,6 @@
 "Address" => "Adresa",
 "List" => "Lista",
 "Settings" => "Postavke",
-"Import" => "Uvezi",
+"Export" => "Izvoz",
-"Export" => "Izvoz"
+"Import" => "Uvezi"
 );

l10n/hu_HU.php

@@ -4,8 +4,6 @@
 "Warning" => "Figyelmeztetés",
 "Close" => "Bezár",
 "Save" => "Mentés",
-"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",
@@ -13,7 +11,8 @@
 "List" => "Lista",
 "Settings" => "Beállítások",
 "You have no bookmarks" => "Nincsenek könyvjelzőid",
-"Bookmarklet <br />" => "Könyvjelzőalkalmazás <br />",
+"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!",
-"Import" => "Import",
+"Read later" => "Később olvasom",
-"Export" => "Exportálás"
+"Export" => "Exportálás",
+"Import" => "Import"
 );

l10n/ia.php

@@ -7,6 +7,6 @@
 "Address" => "Adresse",
 "List" => "Lista",
 "Settings" => "Configurationes",
-"Import" => "Importar",
+"Export" => "Exportar",
-"Export" => "Exportar"
+"Import" => "Importar"
 );

l10n/id.php

@@ -4,7 +4,6 @@
 "Close" => "tutup",
 "The title of the page" => "judul laman",
 "Save" => "simpan",
-"Read later" => "baca nanti",
 "Edit" => "ubah",
 "Delete" => "hapus",
 "Cancel" => "batal",
@@ -15,6 +14,7 @@
 "Show" => "tampilkan",
 "Related Tags" => "label terkait",
 "Settings" => "pengaturan",
-"Import" => "mengimpor",
+"Read later" => "baca nanti",
-"Export" => "mengekspor"
+"Export" => "mengekspor",
+"Import" => "mengimpor"
 );

l10n/it.php

@@ -14,8 +14,6 @@
 "The address of the page" => "L'indirizzo della pagina",
 "Description of the page" => "Descrizione della pagina",
 "Save" => "Salva",
-"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",
@@ -28,10 +26,8 @@
 "Related Tags" => "Tag correlati",
 "Settings" => "Impostazioni",
 "You have no bookmarks" => "Non hai segnalibri",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"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:",
-"Import bookmarks" => "Importa segnalibri",
+"Read later" => "Leggi dopo",
-"html bookmarks file" => "File di segnalibri html",
+"Export" => "Esporta",
-"Import" => "Importa",
+"Import" => "Importa"
-"Export bookmarks" => "Esporta segnalibri",
-"Export" => "Esporta"
 );

l10n/ja_JP.php

@@ -11,8 +11,6 @@
 "The address of the page" => "ページのアドレス",
 "Description of the page" => "ページの説明",
 "Save" => "保存",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Webページをすぐにブックマークしたい場合は、これをブラウザのブックマークにドラッグし、クリックしてください:",
-"Read later" => "後で確認",
 "Edit" => "編集",
 "Delete" => "削除",
 "Cancel" => "キャンセル",
@@ -25,9 +23,8 @@
 "Related Tags" => "関連タグ",
 "Settings" => "設定",
 "You have no bookmarks" => "ブックマークがありません",
-"Bookmarklet <br />" => "ブックマークレット <br />",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Webページをすぐにブックマークしたい場合は、これをブラウザのブックマークにドラッグし、クリックしてください:",
-"Import bookmarks" => "ブックマークをインポート",
+"Read later" => "後で確認",
-"Import" => "インポート",
+"Export" => "エクスポート",
-"Export bookmarks" => "ブックマークをエクスポート",
+"Import" => "インポート"
-"Export" => "エクスポート"
 );

l10n/ka_GE.php

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

l10n/ko.php

@@ -8,6 +8,6 @@
 "Address" => "주소",
 "List" => "목록",
 "Settings" => "설정",
-"Import" => "가져오기",
+"Export" => "내보내기",
-"Export" => "내보내기"
+"Import" => "가져오기"
 );

l10n/ku_IQ.php

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

l10n/lb.php

@@ -8,6 +8,6 @@
 "Address" => "Adress",
 "List" => "Lescht",
 "Settings" => "Astellungen",
-"Import" => "Import",
+"Export" => "Export",
-"Export" => "Export"
+"Import" => "Import"
 );

l10n/lt_LT.php

@@ -9,6 +9,6 @@
 "Address" => "Adresas",
 "List" => "Sąrašas",
 "Settings" => "Nustatymai",
-"Import" => "Importuoti",
+"Export" => "Eksportuoti",
-"Export" => "Eksportuoti"
+"Import" => "Importuoti"
 );

l10n/mk.php

@@ -8,6 +8,6 @@
 "Address" => "Адреса",
 "List" => "Листа",
 "Settings" => "Параметри",
-"Import" => "Внеси",
+"Export" => "Извези",
-"Export" => "Извези"
+"Import" => "Внеси"
 );

l10n/ms_MY.php

@@ -9,6 +9,6 @@
 "Address" => "Alamat",
 "List" => "Senarai",
 "Settings" => "Tetapan",
-"Import" => "Import",
+"Export" => "Export",
-"Export" => "Export"
+"Import" => "Import"
 );

l10n/nb_NO.php

@@ -11,8 +11,6 @@
 "The address of the page" => "Adressen til siden",
 "Description of the page" => "Beskrivelse av siden",
 "Save" => "Lagre",
-"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",
@@ -25,9 +23,8 @@
 "Related Tags" => "Relaterte tagger",
 "Settings" => "Innstillinger",
 "You have no bookmarks" => "Du har ingen bokmerker",
-"Bookmarklet <br />" => "Bokmerke <br />",
+"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",
-"Import bookmarks" => "Importer bokmerker",
+"Read later" => "Les senere",
-"Import" => "Importer",
+"Export" => "Eksporter",
-"Export bookmarks" => "Eksporter bokmerker",
+"Import" => "Importer"
-"Export" => "Eksporter"
 );

l10n/nl.php

@@ -11,8 +11,6 @@
 "The address of the page" => "Het pagina adres",
 "Description of the page" => "Pagina beschrijving",
 "Save" => "Bewaar",
-"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",
@@ -25,9 +23,8 @@
 "Related Tags" => "Aanverwante tags",
 "Settings" => "Instellingen",
 "You have no bookmarks" => "U heeft geen bladwijzers",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"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:",
-"Import bookmarks" => "Importeer bladwijzers",
+"Read later" => "Lees later",
-"Import" => "Importeer",
+"Export" => "Exporteer",
-"Export bookmarks" => "Exporteer bladwijzers",
+"Import" => "Importeer"
-"Export" => "Exporteer"
 );

l10n/nn_NO.php

@@ -7,6 +7,6 @@
 "Address" => "Adresse",
 "List" => "Liste",
 "Settings" => "Innstillingar",
-"Import" => "Importer",
+"Export" => "Eksporter",
-"Export" => "Eksporter"
+"Import" => "Importer"
 );

l10n/oc.php

@@ -6,6 +6,6 @@
 "Cancel" => "Annula",
 "List" => "Tièra",
 "Settings" => "Configuracion",
-"Import" => "Importa",
+"Export" => "Exporta",
-"Export" => "Exporta"
+"Import" => "Importa"
 );

l10n/pl.php

@@ -11,8 +11,6 @@
 "The address of the page" => "Adres strony",
 "Description of the page" => "Opis strony",
 "Save" => "Zapisz",
-"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",
@@ -25,9 +23,8 @@
 "Related Tags" => "Powiązane Tagi",
 "Settings" => "Ustawienia",
 "You have no bookmarks" => "Nie masz żadnych zakładek",
-"Bookmarklet <br />" => "Skryptozakładka <br />",
+"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:",
-"Import bookmarks" => "Importuj zakładki",
+"Read later" => "Czytaj później",
-"Import" => "Import",
+"Export" => "Export",
-"Export bookmarks" => "Eksportuj zakładki",
+"Import" => "Import"
-"Export" => "Export"
 );

l10n/pt_BR.php

@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Arquivo para importação não suportado",
 "Bookmarks" => "Marcadores",
 "Tags" => "Tags",
 "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,8 +14,6 @@
 "The address of the page" => "O endereço da página",
 "Description of the page" => "Descrição da página",
 "Save" => "Salvar",
-"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",
@@ -25,9 +26,8 @@
 "Related Tags" => "Tags relacionadas",
 "Settings" => "Ajustes",
 "You have no bookmarks" => "Você não tem marcadores",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"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:",
-"Import bookmarks" => "Importar bookmarks",
+"Read later" => "Ler depois",
-"Import" => "Importar",
+"Export" => "Exportar",
-"Export bookmarks" => "Exportar bookmarks",
+"Import" => "Importar"
-"Export" => "Exportar"
 );

l10n/pt_PT.php

@@ -11,8 +11,6 @@
 "The address of the page" => "O endereço da página",
 "Description of the page" => "Descrição da página",
 "Save" => "Guardar",
-"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",
@@ -25,9 +23,8 @@
 "Related Tags" => "Etiquetas relacionadas",
 "Settings" => "Configurações",
 "You have no bookmarks" => "Não tem marcadores",
-"Bookmarklet <br />" => "Marcador",
+"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.",
-"Import bookmarks" => "Importar marcadores",
+"Read later" => "Ler mais tarde",
-"Import" => "Importar",
+"Export" => "Exportar",
-"Export bookmarks" => "Exportar marcadores",
+"Import" => "Importar"
-"Export" => "Exportar"
 );

l10n/ro.php

@@ -5,8 +5,6 @@
 "Bookm." => "Bookm.",
 "Close" => "Închide",
 "Save" => "Salvează",
-"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",
@@ -14,7 +12,8 @@
 "List" => "Listă",
 "Settings" => "Setări",
 "You have no bookmarks" => "Nu ai nici un semn de carte",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"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:",
-"Import" => "Importă",
+"Read later" => "Citește mai târziu",
-"Export" => "Exportă"
+"Export" => "Exportă",
+"Import" => "Importă"
 );

l10n/ru.php

@@ -11,8 +11,6 @@
 "The address of the page" => "Адрес страницы",
 "Description of the page" => "Описание страницы",
 "Save" => "Сохранить",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Перетащите эту кнопку в закладки вашего браузера и нажимайте на неё для быстрого добавления страницы в закладки:",
-"Read later" => "Прочитать позже",
 "Edit" => "Редактировать",
 "Delete" => "Удалить",
 "Cancel" => "Отменить",
@@ -25,9 +23,8 @@
 "Related Tags" => "Связанные теги",
 "Settings" => "Конфигурация",
 "You have no bookmarks" => "У вас нет закладок",
-"Bookmarklet <br />" => "Быстрые закладки<br />",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Перетащите эту кнопку в закладки вашего браузера и нажимайте на неё для быстрого добавления страницы в закладки:",
-"Import bookmarks" => "Импортировать закладки",
+"Read later" => "Прочитать позже",
-"Import" => "Импорт",
+"Export" => "Экспорт",
-"Export bookmarks" => "Экспортировать закладки",
+"Import" => "Импорт"
-"Export" => "Экспорт"
 );

l10n/ru_RU.php

@@ -14,8 +14,6 @@
 "The address of the page" => "Адрес страницы",
 "Description of the page" => "Описание страницы",
 "Save" => "Сохранить",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Перетащите это в закладки Вашего браузера и кликните на него, когда захотите быстро добавить страницу в закладки:",
-"Read later" => "Прочитать позже",
 "Edit" => "Редактировать",
 "Delete" => "Удалить",
 "Cancel" => "Отмена",
@@ -28,10 +26,8 @@
 "Related Tags" => "Связанные теги",
 "Settings" => "Настройки",
 "You have no bookmarks" => "У Вас нет закладок",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Перетащите это в закладки Вашего браузера и кликните на него, когда захотите быстро добавить страницу в закладки:",
-"Import bookmarks" => "Импорт закладок",
+"Read later" => "Прочитать позже",
-"html bookmarks file" => "файл html-закладок",
+"Export" => "Экспортировать",
-"Import" => "Импортировать",
+"Import" => "Импортировать"
-"Export bookmarks" => "Экспорт закладок",
-"Export" => "Экспортировать"
 );

l10n/si_LK.php

@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "ආයාත කරන ගොනුව රුචි නොවේ",
 "Bookmarks" => "පිටු සළකුනු",
 "Tags" => "ටැග",
 "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,8 +14,6 @@
 "The address of the page" => "පිටුවේ ලිපිනය",
 "Description of the page" => "පිටුවේ විස්තර",
 "Save" => "සුරකින්න",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "මෙම වෙබ් පිටුව ඉක්මනින් පිටු සළකුනක් ලෙස සටහන් කිරීමට, එය බ්‍රවුසරයේ පිටු සළකුනු මතට ඇද ක්ලික් කරන්න:",
-"Read later" => "පසුව කියවීමට",
 "Edit" => "සකසන්න",
 "Delete" => "මකන්න",
 "Cancel" => "එපා",
@@ -25,9 +26,8 @@
 "Related Tags" => "අදාළ ටැගයන්",
 "Settings" => "සිටුවම්",
 "You have no bookmarks" => "පිටු සළකුනු නොමැත",
-"Bookmarklet <br />" => "පිටුසන<br />",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "මෙම වෙබ් පිටුව ඉක්මනින් පිටු සළකුනක් ලෙස සටහන් කිරීමට, එය බ්‍රවුසරයේ පිටු සළකුනු මතට ඇද ක්ලික් කරන්න:",
-"Import bookmarks" => "පිටුසනයන් ආයාත කරන්න",
+"Read later" => "පසුව කියවීමට",
-"Import" => "ආයාත කරන්න",
+"Export" => "නිර්යාත කරන්න",
-"Export bookmarks" => "පිටුසනයන් නිර්යාත කරන්න",
+"Import" => "ආයාත කරන්න"
-"Export" => "නිර්යාත කරන්න"
 );

l10n/sk_SK.php

@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Nepodporovaný typ súboru pre import",
 "Bookmarks" => "Záložky",
 "Tags" => "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,8 +14,6 @@
 "The address of the page" => "Adresa stránky",
 "Description of the page" => "Popis stránky",
 "Save" => "Ulož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ť",
@@ -25,9 +26,8 @@
 "Related Tags" => "Podobné značky",
 "Settings" => "Nastavenia",
 "You have no bookmarks" => "Nemáte záložky",
-"Bookmarklet <br />" => "Záložky <br />",
+"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.",
-"Import bookmarks" => "Importovať záložky",
+"Read later" => "Prečítať neskôr",
-"Import" => "Import",
+"Export" => "Export",
-"Export bookmarks" => "Export záložiek",
+"Import" => "Import"
-"Export" => "Export"
 );

l10n/sl.php

@@ -11,8 +11,6 @@
 "The address of the page" => "Naslov strani",
 "Description of the page" => "Opis strani",
 "Save" => "Shrani",
-"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",
@@ -25,9 +23,8 @@
 "Related Tags" => "Sorodne oznake",
 "Settings" => "Nastavitve",
 "You have no bookmarks" => "Nimate zaznamkov",
-"Bookmarklet <br />" => "Vstavek za zaznamke <br />",
+"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:",
-"Import bookmarks" => "Uvozi zaznamke",
+"Read later" => "Preberi kasneje",
-"Import" => "Uvozi",
+"Export" => "Izvozi",
-"Export bookmarks" => "Izvozi zaznamke",
+"Import" => "Uvozi"
-"Export" => "Izvozi"
 );

l10n/sv.php

@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "Filtypen stöds ej för import",
 "Bookmarks" => "Bokmärken",
 "Tags" => "Taggar",
 "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,8 +14,6 @@
 "The address of the page" => "Adress till sidan",
 "Description of the page" => "Beskrivning av sidan",
 "Save" => "Spara",
-"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",
@@ -25,9 +26,8 @@
 "Related Tags" => "Relaterade taggar",
 "Settings" => "Inställningar",
 "You have no bookmarks" => "Du har inga bokmärken",
-"Bookmarklet <br />" => "Skriptbokmärke <br />",
+"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:",
-"Import bookmarks" => "Importera bokmärken",
+"Read later" => "Läs senare",
-"Import" => "Importera",
+"Export" => "Exportera",
-"Export bookmarks" => "Exportera bokmärken",
+"Import" => "Importera"
-"Export" => "Exportera"
 );

l10n/ta_LK.php

@@ -8,6 +8,6 @@
 "Cancel" => "இரத்து செய்க",
 "List" => "பட்டியல்",
 "Settings" => "அமைப்புகள்",
-"Import" => "இறக்குமதி",
+"Export" => "ஏற்றுமதி",
-"Export" => "ஏற்றுமதி"
+"Import" => "இறக்குமதி"
 );

l10n/th_TH.php

@@ -11,8 +11,6 @@
 "The address of the page" => "ที่อยู่ของหน้า",
 "Description of the page" => "คำอธิบายเกี่ยวกับหน้า",
 "Save" => "บันทึก",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "ลากสิ่งนี้ไปไว้ที่รายการโปรดในโปรแกรมบราวเซอร์ของคุณ แล้วคลิกที่นั่น, เมื่อคุณต้องการเก็บหน้าเว็บเพจเข้าไปไว้ในรายการโปรดอย่างรวดเร็ว",
-"Read later" => "อ่านภายหลัง",
 "Edit" => "แก้ไข",
 "Delete" => "ลบ",
 "Cancel" => "ยกเลิก",
@@ -25,9 +23,8 @@
 "Related Tags" => "ป้ายกำกับอื่นๆที่เกี่ยวข้อง",
 "Settings" => "ตั้งค่า",
 "You have no bookmarks" => "คุณยังไม่มีรายการโปรด",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "ลากสิ่งนี้ไปไว้ที่รายการโปรดในโปรแกรมบราวเซอร์ของคุณ แล้วคลิกที่นั่น, เมื่อคุณต้องการเก็บหน้าเว็บเพจเข้าไปไว้ในรายการโปรดอย่างรวดเร็ว",
-"Import bookmarks" => "นำเข้ารายการโปรด",
+"Read later" => "อ่านภายหลัง",
-"Import" => "นำเข้า",
+"Export" => "ส่งออก",
-"Export bookmarks" => "ส่งออกรายการโปรด",
+"Import" => "นำเข้า"
-"Export" => "ส่งออก"
 );

l10n/tr.php

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

l10n/uk.php

@@ -3,7 +3,6 @@
 "Tags" => "Теги",
 "Close" => "Закрити",
 "Save" => "Зберегти",
-"Read later" => "Прочитати пізніше",
 "Edit" => "Редагувати",
 "Delete" => "Видалити",
 "Cancel" => "Відмінити",
@@ -11,6 +10,7 @@
 "List" => "Список",
 "Settings" => "Налаштування",
 "You have no bookmarks" => "У вас нема закладок",
-"Import" => "Імпорт",
+"Read later" => "Прочитати пізніше",
-"Export" => "Експорт"
+"Export" => "Експорт",
+"Import" => "Імпорт"
 );

l10n/vi.php

@@ -3,8 +3,6 @@
 "Tags" => "Tags",
 "Close" => "Đóng",
 "Save" => "Lưu",
-"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",
@@ -12,7 +10,8 @@
 "List" => "Danh sách",
 "Settings" => "Tùy chỉnh",
 "You have no bookmarks" => "Bạn chưa có đánh dấu nào",
-"Bookmarklet <br />" => "Bookmarklet <br />",
+"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:",
-"Import" => "Nhập",
+"Read later" => "Đọc sau",
-"Export" => "Xuất"
+"Export" => "Xuất",
+"Import" => "Nhập"
 );

l10n/zh_CN.GB2312.php

@@ -11,8 +11,6 @@
 "The address of the page" => "页面地址",
 "Description of the page" => "页面描述",
 "Save" => "保存",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "拖动此物到您的浏览器书签栏，在您想要快速订阅某网页时点击：",
-"Read later" => "稍后阅读",
 "Edit" => "编辑",
 "Delete" => "删除",
 "Cancel" => "取消",
@@ -25,9 +23,8 @@
 "Related Tags" => "相关标签",
 "Settings" => "设置",
 "You have no bookmarks" => "您没有书签",
-"Bookmarklet <br />" => "小书签 <br />",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "拖动此物到您的浏览器书签栏，在您想要快速订阅某网页时点击：",
-"Import bookmarks" => "导入书签",
+"Read later" => "稍后阅读",
-"Import" => "导入",
+"Export" => "导出",
-"Export bookmarks" => "导出书签",
+"Import" => "导入"
-"Export" => "导出"
 );

l10n/zh_CN.php

@@ -11,8 +11,6 @@
 "The address of the page" => "页面地址",
 "Description of the page" => "页面描述",
 "Save" => "保存",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "拖曳此处到您的浏览器书签处，点击可以将网页快速添加到书签中。",
-"Read later" => "稍后阅读",
 "Edit" => "编辑",
 "Delete" => "删除",
 "Cancel" => "取消",
@@ -25,9 +23,8 @@
 "Related Tags" => "相关标签",
 "Settings" => "设置",
 "You have no bookmarks" => "您暂无书签",
-"Bookmarklet <br />" => "书签应用",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "拖曳此处到您的浏览器书签处，点击可以将网页快速添加到书签中。",
-"Import bookmarks" => "导入书签",
+"Read later" => "稍后阅读",
-"Import" => "导入",
+"Export" => "导出",
-"Export bookmarks" => "导出书签",
+"Import" => "导入"
-"Export" => "导出"
 );

l10n/zh_TW.php

@@ -3,8 +3,6 @@
 "Tags" => "標籤",
 "Close" => "關閉",
 "Save" => "儲存",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "將此拖曳至您的瀏覽器書籤並點擊, 當你想要將網頁快速地加入書籤:",
-"Read later" => "稍後閱讀",
 "Edit" => "編輯",
 "Delete" => "刪除",
 "Cancel" => "取消",
@@ -12,7 +10,8 @@
 "List" => "清單",
 "Settings" => "設定",
 "You have no bookmarks" => "你沒有書籤",
-"Bookmarklet <br />" => "書籤小工具",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "將此拖曳至您的瀏覽器書籤並點擊, 當你想要將網頁快速地加入書籤:",
-"Import" => "匯入",
+"Read later" => "稍後閱讀",
-"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/list.php

@@ -33,14 +33,17 @@
 
 
 <div id="bookmark_settings">
-		<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">
@@ -48,9 +51,9 @@
 	<div id="firstrun" style="display: none;">
 		<?php
 			echo $l->t('You have no bookmarks');
-			$embedded = true;
+			$embedded = true;/*
 			require_once OC_App::getAppPath('bookmarks') .'/templates/bookmarklet.php' ;
-			createBookmarklet(); 
+			createBookmarklet(); */
 		?>
 	<div id="appsettings" class="popup bottomleft hidden"></div>
 </div>

templates/settings.php

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