From f81072ec20ac0fc0c3099b673c9ce08cd375b3c9 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 3 Nov 2012 00:02:23 +0100 Subject: [PATCH 01/57] [tx-robot] updated from transifex --- l10n/ca.php | 4 ++++ l10n/si_LK.php | 4 ++++ l10n/sk_SK.php | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/l10n/ca.php b/l10n/ca.php index 80a846f9..a71f4fe2 100644 --- a/l10n/ca.php +++ b/l10n/ca.php @@ -1,9 +1,12 @@ "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", @@ -27,6 +30,7 @@ "You have no bookmarks" => "No teniu adreces d'interès", "Bookmarklet
" => "Bookmarklet
", "Import bookmarks" => "Importa les adreces d'interès", +"html bookmarks file" => "fitxer d'adreces d'interès html", "Import" => "Importa", "Export bookmarks" => "Exporta adreces d'interès", "Export" => "Exporta" diff --git a/l10n/si_LK.php b/l10n/si_LK.php index 4650f4ff..0cc4b8cc 100644 --- a/l10n/si_LK.php +++ b/l10n/si_LK.php @@ -1,9 +1,12 @@ "ආයාත කරන ගොනුව රුචි නොවේ", "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" => "වසන්න", @@ -27,6 +30,7 @@ "You have no bookmarks" => "පිටු සළකුනු නොමැත", "Bookmarklet
" => "පිටුසන
", "Import bookmarks" => "පිටුසනයන් ආයාත කරන්න", +"html bookmarks file" => "html පිටුසන සහිත ගොනුවක්", "Import" => "ආයාත කරන්න", "Export bookmarks" => "පිටුසනයන් නිර්යාත කරන්න", "Export" => "නිර්යාත කරන්න" diff --git a/l10n/sk_SK.php b/l10n/sk_SK.php index 12a32c9b..459fe504 100644 --- a/l10n/sk_SK.php +++ b/l10n/sk_SK.php @@ -1,9 +1,12 @@ "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ť", @@ -27,6 +30,7 @@ "You have no bookmarks" => "Nemáte záložky", "Bookmarklet
" => "Záložky
", "Import bookmarks" => "Importovať záložky", +"html bookmarks file" => "html súbor záložiek", "Import" => "Import", "Export bookmarks" => "Export záložiek", "Export" => "Export" From f50e01a96b8709443b4e91af99f057daa1bd269d Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Sat, 3 Nov 2012 21:46:42 +0000 Subject: [PATCH 02/57] Bookmark: simplify settings and implement hide&show button. ref #51 --- css/bookmarks.css | 48 ++++++++++++++++++++++++--------------- index.php | 1 + js/bookmarks.js | 10 ++++---- js/settings.js | 10 ++++---- settings.php | 12 ---------- templates/bookmarklet.php | 8 ------- templates/list.php | 21 +++++++++-------- templates/settings.php | 30 ++++++++++++------------ 8 files changed, 69 insertions(+), 71 deletions(-) delete mode 100644 settings.php delete mode 100644 templates/bookmarklet.php diff --git a/css/bookmarks.css b/css/bookmarks.css index 3062ad9c..b6b09327 100644 --- a/css/bookmarks.css +++ b/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; } \ No newline at end of file diff --git a/index.php b/index.php index 5da06b7d..66892f82 100644 --- a/index.php +++ b/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'); diff --git a/js/bookmarks.js b/js/bookmarks.js index 0b5f4f08..c151bb95 100644 --- a/js/bookmarks.js +++ b/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 { - OC.appSettings({appid:'bookmarks', loadJS:true, cache:false}); - } catch(e) { - alert(e); - } + $('#bookmark_settings').toggleClass('open'); }); + $('#bm_export').click(exportBm); $(window).resize(function () { fillWindow($('.bookmarks_list')); diff --git a/js/settings.js b/js/settings.js index f005337d..1865983e 100644 --- a/js/settings.js +++ b/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 () { diff --git a/settings.php b/settings.php deleted file mode 100644 index dae1d581..00000000 --- a/settings.php +++ /dev/null @@ -1,12 +0,0 @@ - - * 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(); diff --git a/templates/bookmarklet.php b/templates/bookmarklet.php deleted file mode 100644 index b645388c..00000000 --- a/templates/bookmarklet.php +++ /dev/null @@ -1,8 +0,0 @@ -' . $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:') . '
' - . '' - . $l->t('Read later') . ''; -} diff --git a/templates/list.php b/templates/list.php index 57cad422..b529d49c 100644 --- a/templates/list.php +++ b/templates/list.php @@ -33,14 +33,17 @@
-
    -
  • - -
    • -
+
    +
  • + +
    • +
+
+
+
@@ -48,9 +51,9 @@ diff --git a/templates/settings.php b/templates/settings.php index 33a96c1d..1af87301 100644 --- a/templates/settings.php +++ b/templates/settings.php @@ -8,11 +8,16 @@ ?>
- t('Bookmarklet
');?> - + t('Bookmarklet');?> + + t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:');?> +
+ + t('Read later');?> +
" @@ -23,16 +28,13 @@

- t('Import bookmarks');?> -

- -

- -
+ t('Export & Import');?> + + + +
+ - t('Export bookmarks');?> -

t('Export'); ?>

From 3bf8aff4e30ef9bdcc8f7d1ef340d4006c425f19 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 4 Nov 2012 00:03:02 +0100 Subject: [PATCH 03/57] [tx-robot] updated from transifex --- l10n/ar.php | 4 ++-- l10n/bg_BG.php | 9 ++++----- l10n/ca.php | 12 ++++-------- l10n/cs_CZ.php | 12 ++++-------- l10n/da.php | 11 ++++------- l10n/de.php | 14 +++++++------- l10n/de_DE.php | 12 ++++-------- l10n/el.php | 11 ++++------- l10n/eo.php | 11 ++++------- l10n/es.php | 13 ++++++------- l10n/es_AR.php | 12 ++++-------- l10n/et_EE.php | 11 ++++------- l10n/eu.php | 11 ++++------- l10n/fa.php | 8 ++++---- l10n/fi_FI.php | 11 ++++------- l10n/fr.php | 14 +++++++------- l10n/gl.php | 9 ++++----- l10n/he.php | 8 ++++---- l10n/hr.php | 4 ++-- l10n/hu_HU.php | 9 ++++----- l10n/ia.php | 4 ++-- l10n/id.php | 6 +++--- l10n/it.php | 12 ++++-------- l10n/ja_JP.php | 11 ++++------- l10n/ka_GE.php | 11 ++++------- l10n/ko.php | 4 ++-- l10n/ku_IQ.php | 9 ++++----- l10n/lb.php | 4 ++-- l10n/lt_LT.php | 4 ++-- l10n/mk.php | 4 ++-- l10n/ms_MY.php | 4 ++-- l10n/nb_NO.php | 11 ++++------- l10n/nl.php | 11 ++++------- l10n/nn_NO.php | 4 ++-- l10n/oc.php | 4 ++-- l10n/pl.php | 11 ++++------- l10n/pt_BR.php | 14 +++++++------- l10n/pt_PT.php | 11 ++++------- l10n/ro.php | 9 ++++----- l10n/ru.php | 11 ++++------- l10n/ru_RU.php | 12 ++++-------- l10n/si_LK.php | 12 ++++-------- l10n/sk_SK.php | 12 ++++-------- l10n/sl.php | 11 ++++------- l10n/sv.php | 14 +++++++------- l10n/ta_LK.php | 4 ++-- l10n/th_TH.php | 11 ++++------- l10n/tr.php | 6 +++--- l10n/uk.php | 6 +++--- l10n/vi.php | 9 ++++----- l10n/zh_CN.GB2312.php | 11 ++++------- l10n/zh_CN.php | 11 ++++------- l10n/zh_TW.php | 9 ++++----- 53 files changed, 201 insertions(+), 292 deletions(-) diff --git a/l10n/ar.php b/l10n/ar.php index 7116bfd7..63924005 100644 --- a/l10n/ar.php +++ b/l10n/ar.php @@ -7,6 +7,6 @@ "Address" => "عنوان", "List" => "قائمة", "Settings" => "تعديلات", -"Import" => "إدخال", -"Export" => "تصدير المعلومات" +"Export" => "تصدير المعلومات", +"Import" => "إدخال" ); diff --git a/l10n/bg_BG.php b/l10n/bg_BG.php index a525e952..b9f539b2 100644 --- a/l10n/bg_BG.php +++ b/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
" => "Бутон за отметки
", -"Import" => "Внасяне", -"Export" => "Изнасяне" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Завлачете това в лентата с отметки на браузъра си и го натискайте, когато искате да отметнете бързо някоя страница:", +"Read later" => "Отмятане", +"Export" => "Изнасяне", +"Import" => "Внасяне" ); diff --git a/l10n/ca.php b/l10n/ca.php index a71f4fe2..cd8c48b6 100644 --- a/l10n/ca.php +++ b/l10n/ca.php @@ -14,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", @@ -28,10 +26,8 @@ "Related Tags" => "Etiquetes relacionades", "Settings" => "Configuració", "You have no bookmarks" => "No teniu adreces d'interès", -"Bookmarklet
" => "Bookmarklet
", -"Import bookmarks" => "Importa les adreces d'interès", -"html bookmarks file" => "fitxer d'adreces d'interès html", -"Import" => "Importa", -"Export bookmarks" => "Exporta adreces d'interès", -"Export" => "Exporta" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arrossegueu-ho al navegador i feu-hi un clic quan volgueu marcar ràpidament una adreça d'interès:", +"Read later" => "Llegeix més tard", +"Export" => "Exporta", +"Import" => "Importa" ); diff --git a/l10n/cs_CZ.php b/l10n/cs_CZ.php index b18bdd2c..929a436e 100644 --- a/l10n/cs_CZ.php +++ b/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
" => "Záložky
", -"Import bookmarks" => "Importovat záložky", -"html bookmarks file" => "soubor záložek html", -"Import" => "Importovat", -"Export bookmarks" => "Exportovat záložky", -"Export" => "Exportovat" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Přetáhněte do Vašeho prohlížeče a klikněte, pokud si přejete rychle uložit stránku do záložek:", +"Read later" => "Přečíst později", +"Export" => "Exportovat", +"Import" => "Importovat" ); diff --git a/l10n/da.php b/l10n/da.php index 49c6b623..d3dee958 100644 --- a/l10n/da.php +++ b/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
" => "Bookmarklet
", -"Import bookmarks" => "Importer bogmærker", -"Import" => "Importer", -"Export bookmarks" => "Exporter bogmærker", -"Export" => "Exporter" +"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", +"Export" => "Exporter", +"Import" => "Importer" ); diff --git a/l10n/de.php b/l10n/de.php index b198da80..6ad3f1b4 100644 --- a/l10n/de.php +++ b/l10n/de.php @@ -1,9 +1,12 @@ "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
" => "Bookmarklet
", -"Import bookmarks" => "Lesezeichen importieren", -"Import" => "Importieren", -"Export bookmarks" => "Lesezeichen exportieren", -"Export" => "Exportieren" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ziehe dies zu Deinen Browser-Lesezeichen und klicke darauf, wenn Du eine Website schnell den Lesezeichen hinzufügen willst.", +"Read later" => "Später lesen", +"Export" => "Exportieren", +"Import" => "Importieren" ); diff --git a/l10n/de_DE.php b/l10n/de_DE.php index 6fbcc8ec..e928e889 100644 --- a/l10n/de_DE.php +++ b/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
" => "Bookmarklet
", -"Import bookmarks" => "Lesezeichen importieren", -"html bookmarks file" => "HTML-Lesezeichen-Datei", -"Import" => "Importieren", -"Export bookmarks" => "Lesezeichen exportieren", -"Export" => "Exportieren" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ziehen Sie dies zu Ihren Browser-Lesezeichen und klicken Sie darauf, wenn Sie eine Website schnell den Lesezeichen hinzufügen wollen.", +"Read later" => "Später lesen", +"Export" => "Exportieren", +"Import" => "Importieren" ); diff --git a/l10n/el.php b/l10n/el.php index d71593e9..53fc5e0b 100644 --- a/l10n/el.php +++ b/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
" => "Εφαρμογίδιο Σελιδοδεικτών
", -"Import bookmarks" => "Εισαγωγή σελιδοδεικτών", -"Import" => "Εισαγωγή", -"Export bookmarks" => "Εξαγωγή σελιδοδεικτών", -"Export" => "Εξαγωγή" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Σύρετε αυτό στους σελιδοδείκτες του περιηγητή σας και κάντε κλικ επάνω του, όταν θέλετε να προσθέσετε σύντομα μια ιστοσελίδα ως σελιδοδείκτη:", +"Read later" => "Ανάγνωση αργότερα", +"Export" => "Εξαγωγή", +"Import" => "Εισαγωγή" ); diff --git a/l10n/eo.php b/l10n/eo.php index 65018282..c8b34fbf 100644 --- a/l10n/eo.php +++ b/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
" => "Kodosigno
", -"Import bookmarks" => "Enporti legosignojn", -"Import" => "Enporti", -"Export bookmarks" => "Elporti legosignojn", -"Export" => "Elporti" +"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", +"Export" => "Elporti", +"Import" => "Enporti" ); diff --git a/l10n/es.php b/l10n/es.php index 69dc0db8..74f81117 100644 --- a/l10n/es.php +++ b/l10n/es.php @@ -1,10 +1,12 @@ "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
" => "Bookmarklet
", -"Import bookmarks" => "Importar marcadores", -"Import" => "Importart", -"Export bookmarks" => "Exportar marcadores", -"Export" => "Exportar" +"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", +"Export" => "Exportar", +"Import" => "Importart" ); diff --git a/l10n/es_AR.php b/l10n/es_AR.php index 91958fb5..c72d6311 100644 --- a/l10n/es_AR.php +++ b/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
" => "Bookmarklet
", -"Import bookmarks" => "Importar marcadores", -"html bookmarks file" => "Archivo de marcadores HTML", -"Import" => "Importar", -"Export bookmarks" => "Exportar marcadores", -"Export" => "Exportar" +"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", +"Export" => "Exportar", +"Import" => "Importar" ); diff --git a/l10n/et_EE.php b/l10n/et_EE.php index 26e0c460..300b6b76 100644 --- a/l10n/et_EE.php +++ b/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
" => "Järjehoidja vidin
", -"Import bookmarks" => "Impordi järjehoidjaid", -"Import" => "Impordi", -"Export bookmarks" => "Ekspordi järjehoidjaid", -"Export" => "Ekspordi" +"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", +"Export" => "Ekspordi", +"Import" => "Impordi" ); diff --git a/l10n/eu.php b/l10n/eu.php index a6fd4bcb..e9cb0cef 100644 --- a/l10n/eu.php +++ b/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
" => "Bookmarklet
", -"Import bookmarks" => "Inportatu laster-markak", -"Import" => "Inportatu", -"Export bookmarks" => "Exportatu laster-markak", -"Export" => "Exportatu" +"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", +"Export" => "Exportatu", +"Import" => "Inportatu" ); diff --git a/l10n/fa.php b/l10n/fa.php index c74ccc92..5612a67c 100644 --- a/l10n/fa.php +++ b/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" => "وارد کردن", -"Export" => "خروجی گرفتن" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "هنگامی که می‌خواهید کی صفحه‌ی اینترنتی را بسرعت نشان کنید، این را به نشانه‌های مرورگر خود بکشید و روی آن کلیک کنید.", +"Read later" => "بعد خوانده‌شود", +"Export" => "خروجی گرفتن", +"Import" => "وارد کردن" ); diff --git a/l10n/fi_FI.php b/l10n/fi_FI.php index 5eeff4c7..0dd40424 100644 --- a/l10n/fi_FI.php +++ b/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
" => "Kirjanmerkitsin
", -"Import bookmarks" => "Tuo kirjanmerkkejä", -"Import" => "Tuo", -"Export bookmarks" => "Vie kirjanmerkkejä", -"Export" => "Vie" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Vedä tämä selaimesi kirjanmerkkipalkkiin ja napsauta sitä, kun haluat lisätä kirjanmerkin nopeasti:", +"Read later" => "Lue myöhemmin", +"Export" => "Vie", +"Import" => "Tuo" ); diff --git a/l10n/fr.php b/l10n/fr.php index 677cbfa6..a7d01929 100644 --- a/l10n/fr.php +++ b/l10n/fr.php @@ -1,9 +1,12 @@ "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
" => "Gestionnaire de favoris
", -"Import bookmarks" => "Importer des favoris", -"Import" => "Importer", -"Export bookmarks" => "Exporter les favoris", -"Export" => "Exporter" +"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", +"Export" => "Exporter", +"Import" => "Importer" ); diff --git a/l10n/gl.php b/l10n/gl.php index 4455c633..086ff16b 100644 --- a/l10n/gl.php +++ b/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
" => "Bookmarklet
", -"Import" => "Importar", -"Export" => "Exportar" +"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", +"Export" => "Exportar", +"Import" => "Importar" ); diff --git a/l10n/he.php b/l10n/he.php index 22dbc62e..51563b56 100644 --- a/l10n/he.php +++ b/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" => "יבא", -"Export" => "יצוא" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "ניתן לגרור את הקישור הזה אל סרגל הסימניות בדפדפן שלך וללחוץ עליו כאשר מעוניינים ליצור סימניה לאתר במהירות.", +"Read later" => "קריאה מאוחרת", +"Export" => "יצוא", +"Import" => "יבא" ); diff --git a/l10n/hr.php b/l10n/hr.php index 2b8a080d..6a0dc840 100644 --- a/l10n/hr.php +++ b/l10n/hr.php @@ -8,6 +8,6 @@ "Address" => "Adresa", "List" => "Lista", "Settings" => "Postavke", -"Import" => "Uvezi", -"Export" => "Izvoz" +"Export" => "Izvoz", +"Import" => "Uvezi" ); diff --git a/l10n/hu_HU.php b/l10n/hu_HU.php index d75a4f2d..9ac74119 100644 --- a/l10n/hu_HU.php +++ b/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
" => "Könyvjelzőalkalmazás
", -"Import" => "Import", -"Export" => "Exportálá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", +"Export" => "Exportálás", +"Import" => "Import" ); diff --git a/l10n/ia.php b/l10n/ia.php index fa8e5303..8c897136 100644 --- a/l10n/ia.php +++ b/l10n/ia.php @@ -7,6 +7,6 @@ "Address" => "Adresse", "List" => "Lista", "Settings" => "Configurationes", -"Import" => "Importar", -"Export" => "Exportar" +"Export" => "Exportar", +"Import" => "Importar" ); diff --git a/l10n/id.php b/l10n/id.php index eeb64a69..ab38b1dc 100644 --- a/l10n/id.php +++ b/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", -"Export" => "mengekspor" +"Read later" => "baca nanti", +"Export" => "mengekspor", +"Import" => "mengimpor" ); diff --git a/l10n/it.php b/l10n/it.php index bf8cfd5b..391458a1 100644 --- a/l10n/it.php +++ b/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
" => "Bookmarklet
", -"Import bookmarks" => "Importa segnalibri", -"html bookmarks file" => "File di segnalibri html", -"Import" => "Importa", -"Export bookmarks" => "Esporta segnalibri", -"Export" => "Esporta" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Quando vuoi creare rapidamente un segnalibro, trascinalo sui segnalibri del browser e fai clic su di esso:", +"Read later" => "Leggi dopo", +"Export" => "Esporta", +"Import" => "Importa" ); diff --git a/l10n/ja_JP.php b/l10n/ja_JP.php index 1457b528..dbeb1efc 100644 --- a/l10n/ja_JP.php +++ b/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
" => "ブックマークレット
", -"Import bookmarks" => "ブックマークをインポート", -"Import" => "インポート", -"Export bookmarks" => "ブックマークをエクスポート", -"Export" => "エクスポート" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Webページをすぐにブックマークしたい場合は、これをブラウザのブックマークにドラッグし、クリックしてください:", +"Read later" => "後で確認", +"Export" => "エクスポート", +"Import" => "インポート" ); diff --git a/l10n/ka_GE.php b/l10n/ka_GE.php index 2cddd80d..aebf63f4 100644 --- a/l10n/ka_GE.php +++ b/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
" => "Bookmarklet
", -"Import bookmarks" => "ბუქმარქების იმპორტი", -"Import" => "იმპორტი", -"Export bookmarks" => "ბუქმარქების ექსპორტი", -"Export" => "ექსპორტი" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "გადაათრიეთ ეს თქვენს ბუქმარკებში თუ გინდათ რომ საითი სწრაფად დაბუქმარკდეს", +"Read later" => "წაიკითხე მოგვიანებით", +"Export" => "ექსპორტი", +"Import" => "იმპორტი" ); diff --git a/l10n/ko.php b/l10n/ko.php index 4d4eace5..6c9b1ad4 100644 --- a/l10n/ko.php +++ b/l10n/ko.php @@ -8,6 +8,6 @@ "Address" => "주소", "List" => "목록", "Settings" => "설정", -"Import" => "가져오기", -"Export" => "내보내기" +"Export" => "내보내기", +"Import" => "가져오기" ); diff --git a/l10n/ku_IQ.php b/l10n/ku_IQ.php index fd7aaaf4..08d84db0 100644 --- a/l10n/ku_IQ.php +++ b/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
" => "دڵخوازکرا
", -"Import" => "هێنان", -"Export" => "هه‌ناردن" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "رابکێشه‌ ئه‌مه بۆ دڵخوازه‌کان له‌ وێبگه‌ڕه‌که‌ت وه‌ کرته‌ بکه‌ لێی، کاتێك ده‌ته‌وێت ماڵپه‌ڕێك دڵخواز بکه‌ی به‌خێرای:", +"Read later" => "دووای بیخوێنه‌وه", +"Export" => "هه‌ناردن", +"Import" => "هێنان" ); diff --git a/l10n/lb.php b/l10n/lb.php index 49665741..924a4fac 100644 --- a/l10n/lb.php +++ b/l10n/lb.php @@ -8,6 +8,6 @@ "Address" => "Adress", "List" => "Lescht", "Settings" => "Astellungen", -"Import" => "Import", -"Export" => "Export" +"Export" => "Export", +"Import" => "Import" ); diff --git a/l10n/lt_LT.php b/l10n/lt_LT.php index 70f20b06..38233af6 100644 --- a/l10n/lt_LT.php +++ b/l10n/lt_LT.php @@ -9,6 +9,6 @@ "Address" => "Adresas", "List" => "Sąrašas", "Settings" => "Nustatymai", -"Import" => "Importuoti", -"Export" => "Eksportuoti" +"Export" => "Eksportuoti", +"Import" => "Importuoti" ); diff --git a/l10n/mk.php b/l10n/mk.php index cda4712d..b7f96ee0 100644 --- a/l10n/mk.php +++ b/l10n/mk.php @@ -8,6 +8,6 @@ "Address" => "Адреса", "List" => "Листа", "Settings" => "Параметри", -"Import" => "Внеси", -"Export" => "Извези" +"Export" => "Извези", +"Import" => "Внеси" ); diff --git a/l10n/ms_MY.php b/l10n/ms_MY.php index 2b3d5df1..882fca1d 100644 --- a/l10n/ms_MY.php +++ b/l10n/ms_MY.php @@ -9,6 +9,6 @@ "Address" => "Alamat", "List" => "Senarai", "Settings" => "Tetapan", -"Import" => "Import", -"Export" => "Export" +"Export" => "Export", +"Import" => "Import" ); diff --git a/l10n/nb_NO.php b/l10n/nb_NO.php index 58c49318..46e2579c 100644 --- a/l10n/nb_NO.php +++ b/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
" => "Bokmerke
", -"Import bookmarks" => "Importer bokmerker", -"Import" => "Importer", -"Export bookmarks" => "Eksporter bokmerker", -"Export" => "Eksporter" +"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", +"Export" => "Eksporter", +"Import" => "Importer" ); diff --git a/l10n/nl.php b/l10n/nl.php index bdccf66a..c900f5c0 100644 --- a/l10n/nl.php +++ b/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
" => "Bookmarklet
", -"Import bookmarks" => "Importeer bladwijzers", -"Import" => "Importeer", -"Export bookmarks" => "Exporteer bladwijzers", -"Export" => "Exporteer" +"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", +"Export" => "Exporteer", +"Import" => "Importeer" ); diff --git a/l10n/nn_NO.php b/l10n/nn_NO.php index 02acba26..20249389 100644 --- a/l10n/nn_NO.php +++ b/l10n/nn_NO.php @@ -7,6 +7,6 @@ "Address" => "Adresse", "List" => "Liste", "Settings" => "Innstillingar", -"Import" => "Importer", -"Export" => "Eksporter" +"Export" => "Eksporter", +"Import" => "Importer" ); diff --git a/l10n/oc.php b/l10n/oc.php index 331abd2b..35d89725 100644 --- a/l10n/oc.php +++ b/l10n/oc.php @@ -6,6 +6,6 @@ "Cancel" => "Annula", "List" => "Tièra", "Settings" => "Configuracion", -"Import" => "Importa", -"Export" => "Exporta" +"Export" => "Exporta", +"Import" => "Importa" ); diff --git a/l10n/pl.php b/l10n/pl.php index fc19cf24..98e3e103 100644 --- a/l10n/pl.php +++ b/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
" => "Skryptozakładka
", -"Import bookmarks" => "Importuj zakładki", -"Import" => "Import", -"Export bookmarks" => "Eksportuj zakładki", -"Export" => "Export" +"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", +"Export" => "Export", +"Import" => "Import" ); diff --git a/l10n/pt_BR.php b/l10n/pt_BR.php index 73a94411..d8d9fe6f 100644 --- a/l10n/pt_BR.php +++ b/l10n/pt_BR.php @@ -1,9 +1,12 @@ "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
" => "Bookmarklet
", -"Import bookmarks" => "Importar bookmarks", -"Import" => "Importar", -"Export bookmarks" => "Exportar bookmarks", -"Export" => "Exportar" +"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", +"Export" => "Exportar", +"Import" => "Importar" ); diff --git a/l10n/pt_PT.php b/l10n/pt_PT.php index 1dfd9745..e45325bf 100644 --- a/l10n/pt_PT.php +++ b/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
" => "Marcador", -"Import bookmarks" => "Importar marcadores", -"Import" => "Importar", -"Export bookmarks" => "Exportar marcadores", -"Export" => "Exportar" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arraste isto para o seu navegador, e click nele quando quiser guardar a página rapidamente com um marcador.", +"Read later" => "Ler mais tarde", +"Export" => "Exportar", +"Import" => "Importar" ); diff --git a/l10n/ro.php b/l10n/ro.php index 1eed35bb..ae0ea6f3 100644 --- a/l10n/ro.php +++ b/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
" => "Bookmarklet
", -"Import" => "Importă", -"Export" => "Exportă" +"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", +"Export" => "Exportă", +"Import" => "Importă" ); diff --git a/l10n/ru.php b/l10n/ru.php index 38a2a191..c88909bf 100644 --- a/l10n/ru.php +++ b/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
" => "Быстрые закладки
", -"Import bookmarks" => "Импортировать закладки", -"Import" => "Импорт", -"Export bookmarks" => "Экспортировать закладки", -"Export" => "Экспорт" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Перетащите эту кнопку в закладки вашего браузера и нажимайте на неё для быстрого добавления страницы в закладки:", +"Read later" => "Прочитать позже", +"Export" => "Экспорт", +"Import" => "Импорт" ); diff --git a/l10n/ru_RU.php b/l10n/ru_RU.php index 2c00cc6f..808e4788 100644 --- a/l10n/ru_RU.php +++ b/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
" => "Bookmarklet
", -"Import bookmarks" => "Импорт закладок", -"html bookmarks file" => "файл html-закладок", -"Import" => "Импортировать", -"Export bookmarks" => "Экспорт закладок", -"Export" => "Экспортировать" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Перетащите это в закладки Вашего браузера и кликните на него, когда захотите быстро добавить страницу в закладки:", +"Read later" => "Прочитать позже", +"Export" => "Экспортировать", +"Import" => "Импортировать" ); diff --git a/l10n/si_LK.php b/l10n/si_LK.php index 0cc4b8cc..c7b9e7c6 100644 --- a/l10n/si_LK.php +++ b/l10n/si_LK.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
" => "පිටුසන
", -"Import bookmarks" => "පිටුසනයන් ආයාත කරන්න", -"html bookmarks file" => "html පිටුසන සහිත ගොනුවක්", -"Import" => "ආයාත කරන්න", -"Export bookmarks" => "පිටුසනයන් නිර්යාත කරන්න", -"Export" => "නිර්යාත කරන්න" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "මෙම වෙබ් පිටුව ඉක්මනින් පිටු සළකුනක් ලෙස සටහන් කිරීමට, එය බ්‍රවුසරයේ පිටු සළකුනු මතට ඇද ක්ලික් කරන්න:", +"Read later" => "පසුව කියවීමට", +"Export" => "නිර්යාත කරන්න", +"Import" => "ආයාත කරන්න" ); diff --git a/l10n/sk_SK.php b/l10n/sk_SK.php index 459fe504..218a9594 100644 --- a/l10n/sk_SK.php +++ b/l10n/sk_SK.php @@ -14,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ť", @@ -28,10 +26,8 @@ "Related Tags" => "Podobné značky", "Settings" => "Nastavenia", "You have no bookmarks" => "Nemáte záložky", -"Bookmarklet
" => "Záložky
", -"Import bookmarks" => "Importovať záložky", -"html bookmarks file" => "html súbor záložiek", -"Import" => "Import", -"Export bookmarks" => "Export záložiek", -"Export" => "Export" +"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", +"Export" => "Export", +"Import" => "Import" ); diff --git a/l10n/sl.php b/l10n/sl.php index d3e0a0dc..346ad484 100644 --- a/l10n/sl.php +++ b/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
" => "Vstavek za zaznamke
", -"Import bookmarks" => "Uvozi zaznamke", -"Import" => "Uvozi", -"Export bookmarks" => "Izvozi zaznamke", -"Export" => "Izvozi" +"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", +"Export" => "Izvozi", +"Import" => "Uvozi" ); diff --git a/l10n/sv.php b/l10n/sv.php index c9095b8a..a8023473 100644 --- a/l10n/sv.php +++ b/l10n/sv.php @@ -1,9 +1,12 @@ "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
" => "Skriptbokmärke
", -"Import bookmarks" => "Importera bokmärken", -"Import" => "Importera", -"Export bookmarks" => "Exportera bokmärken", -"Export" => "Exportera" +"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", +"Export" => "Exportera", +"Import" => "Importera" ); diff --git a/l10n/ta_LK.php b/l10n/ta_LK.php index 5a1ed4e2..70aed2b6 100644 --- a/l10n/ta_LK.php +++ b/l10n/ta_LK.php @@ -8,6 +8,6 @@ "Cancel" => "இரத்து செய்க", "List" => "பட்டியல்", "Settings" => "அமைப்புகள்", -"Import" => "இறக்குமதி", -"Export" => "ஏற்றுமதி" +"Export" => "ஏற்றுமதி", +"Import" => "இறக்குமதி" ); diff --git a/l10n/th_TH.php b/l10n/th_TH.php index f4c1eba8..b4fcba65 100644 --- a/l10n/th_TH.php +++ b/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
" => "Bookmarklet
", -"Import bookmarks" => "นำเข้ารายการโปรด", -"Import" => "นำเข้า", -"Export bookmarks" => "ส่งออกรายการโปรด", -"Export" => "ส่งออก" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "ลากสิ่งนี้ไปไว้ที่รายการโปรดในโปรแกรมบราวเซอร์ของคุณ แล้วคลิกที่นั่น, เมื่อคุณต้องการเก็บหน้าเว็บเพจเข้าไปไว้ในรายการโปรดอย่างรวดเร็ว", +"Read later" => "อ่านภายหลัง", +"Export" => "ส่งออก", +"Import" => "นำเข้า" ); diff --git a/l10n/tr.php b/l10n/tr.php index 9d353a1d..01eccbe0 100644 --- a/l10n/tr.php +++ b/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", -"Export" => "Dışa aktar" +"Read later" => "Sonra oku", +"Export" => "Dışa aktar", +"Import" => "İçe aktar" ); diff --git a/l10n/uk.php b/l10n/uk.php index 3b7b2d12..344b8608 100644 --- a/l10n/uk.php +++ b/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" => "Імпорт", -"Export" => "Експорт" +"Read later" => "Прочитати пізніше", +"Export" => "Експорт", +"Import" => "Імпорт" ); diff --git a/l10n/vi.php b/l10n/vi.php index 02f41007..354235fd 100644 --- a/l10n/vi.php +++ b/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
" => "Bookmarklet
", -"Import" => "Nhập", -"Export" => "Xuất" +"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", +"Export" => "Xuất", +"Import" => "Nhập" ); diff --git a/l10n/zh_CN.GB2312.php b/l10n/zh_CN.GB2312.php index b136932e..d90962f3 100644 --- a/l10n/zh_CN.GB2312.php +++ b/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
" => "小书签
", -"Import bookmarks" => "导入书签", -"Import" => "导入", -"Export bookmarks" => "导出书签", -"Export" => "导出" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "拖动此物到您的浏览器书签栏，在您想要快速订阅某网页时点击：", +"Read later" => "稍后阅读", +"Export" => "导出", +"Import" => "导入" ); diff --git a/l10n/zh_CN.php b/l10n/zh_CN.php index c966407d..9b2667bb 100644 --- a/l10n/zh_CN.php +++ b/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
" => "书签应用", -"Import bookmarks" => "导入书签", -"Import" => "导入", -"Export bookmarks" => "导出书签", -"Export" => "导出" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "拖曳此处到您的浏览器书签处，点击可以将网页快速添加到书签中。", +"Read later" => "稍后阅读", +"Export" => "导出", +"Import" => "导入" ); diff --git a/l10n/zh_TW.php b/l10n/zh_TW.php index 7e191969..aa76bc8e 100644 --- a/l10n/zh_TW.php +++ b/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
" => "書籤小工具", -"Import" => "匯入", -"Export" => "匯出" +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "將此拖曳至您的瀏覽器書籤並點擊, 當你想要將網頁快速地加入書籤:", +"Read later" => "稍後閱讀", +"Export" => "匯出", +"Import" => "匯入" ); From 3b4c5d05e45519735b98fd28604b3bf064fa8bd3 Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Sun, 4 Nov 2012 22:47:05 +0000 Subject: [PATCH 04/57] Bookmark: Fix some little settings pbms fix #51 --- css/bookmarks.css | 8 ++++---- js/bookmarks.js | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/css/bookmarks.css b/css/bookmarks.css index b6b09327..f88d5365 100644 --- a/css/bookmarks.css +++ b/css/bookmarks.css @@ -358,15 +358,15 @@ li:hover em { display : none; } } #bookmark_settings.open { - height: 300px; + height: auto; } #bm_setting_panel { - background-color: white; + background-color: #eee; padding: 1em; height: 100%; - display:none; +/* display:none; */ } -.open #bm_setting_panel { display:block; } +/* .open #bm_setting_panel { display:block; } */ #bm_setting_panel legend{ margin-top: 0.5em; diff --git a/js/bookmarks.js b/js/bookmarks.js index c151bb95..d3cb8d90 100644 --- a/js/bookmarks.js +++ b/js/bookmarks.js @@ -13,7 +13,10 @@ $(document).ready(function() { // $('#bm_import_submit').click(attachSettingEvent); $('#bm_import').change(attachSettingEvent); $('#settingsbtn').on('click keydown', function() { - $('#bookmark_settings').toggleClass('open'); + if( $('#bookmark_settings').hasClass('open')) + $('#bookmark_settings').switchClass( "open", "" ); + else + $('#bookmark_settings').switchClass( "", "open"); }); $('#bm_export').click(exportBm); From 193aade77b63f325c95295c87061da156acb3720 Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Sun, 4 Nov 2012 22:55:03 +0000 Subject: [PATCH 05/57] Allow adding bookmark with enter fix #139 --- js/bookmarks.js | 3 ++- templates/list.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/js/bookmarks.js b/js/bookmarks.js index d3cb8d90..15361b82 100644 --- a/js/bookmarks.js +++ b/js/bookmarks.js @@ -8,7 +8,7 @@ var bookmark_view = 'image'; $(document).ready(function() { $('.centercontent').click(clickSideBar); $('#view_type input').click(clickSwitchView); - $('#bookmark_add_submit').click(addBookmark); + $('#add_form').submit(addBookmark); // $('#bm_import_submit').click(attachSettingEvent); $('#bm_import').change(attachSettingEvent); @@ -193,6 +193,7 @@ function createEditDialog(record){ } function addBookmark(event) { + event.preventDefault(); url = $('#add_url').val(); $('#add_url').val(''); bookmark = { url: url, description:'', title:''}; diff --git a/templates/list.php b/templates/list.php index b529d49c..107b3c85 100644 --- a/templates/list.php +++ b/templates/list.php @@ -9,9 +9,9 @@ ?>
- +
- +
From 0404b8c5eff5fe684daf55d246ce7ad405486bb2 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Mon, 5 Nov 2012 00:02:26 +0100 Subject: [PATCH 06/57] [tx-robot] updated from transifex --- l10n/de_DE.php | 2 ++ l10n/fi_FI.php | 4 ++++ l10n/it.php | 2 ++ 3 files changed, 8 insertions(+) diff --git a/l10n/de_DE.php b/l10n/de_DE.php index e928e889..8feab14f 100644 --- a/l10n/de_DE.php +++ b/l10n/de_DE.php @@ -26,8 +26,10 @@ "Related Tags" => "Verwandte Schlagworte", "Settings" => "Einstellungen", "You have no bookmarks" => "Sie haben keine Lesezeichen", +"Bookmarklet" => "Lesezeichen", "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ziehen Sie dies zu Ihren Browser-Lesezeichen und klicken Sie darauf, wenn Sie eine Website schnell den Lesezeichen hinzufügen wollen.", "Read later" => "Später lesen", +"Export & Import" => "Export & Import", "Export" => "Exportieren", "Import" => "Importieren" ); diff --git a/l10n/fi_FI.php b/l10n/fi_FI.php index 0dd40424..944e2867 100644 --- a/l10n/fi_FI.php +++ b/l10n/fi_FI.php @@ -1,9 +1,12 @@ "Tuonti ei tue kyseistä tiedostotyyppiä", "Bookmarks" => "Kirjanmerkit", "Tags" => "Tunnisteet", "Edit bookmark" => "Muokkaa kirjanmerkkejä", "Are you sure you want to remove this tag from every entry?" => "Haluatko varmasti poistaa tämän tunnisteen jokaiselta kohteelta?", "Warning" => "Varoitus", +"Import completed successfully." => "Tuonti valmistui onnistuneesti.", +"Uploading..." => "Lähetetään...", "Bookm." => "Kirjanm.", "Add a bookmark" => "Lisää kirjanmerkki", "Close" => "Sulje", @@ -25,6 +28,7 @@ "You have no bookmarks" => "Sinulla ei ole kirjanmerkkejä", "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Vedä tämä selaimesi kirjanmerkkipalkkiin ja napsauta sitä, kun haluat lisätä kirjanmerkin nopeasti:", "Read later" => "Lue myöhemmin", +"Export & Import" => "Vienti ja tuonti", "Export" => "Vie", "Import" => "Tuo" ); diff --git a/l10n/it.php b/l10n/it.php index 391458a1..7e373d0c 100644 --- a/l10n/it.php +++ b/l10n/it.php @@ -26,8 +26,10 @@ "Related Tags" => "Tag correlati", "Settings" => "Impostazioni", "You have no bookmarks" => "Non hai segnalibri", +"Bookmarklet" => "Bookmarklet", "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Quando vuoi creare rapidamente un segnalibro, trascinalo sui segnalibri del browser e fai clic su di esso:", "Read later" => "Leggi dopo", +"Export & Import" => "Esporta e importa", "Export" => "Esporta", "Import" => "Importa" ); From eefac414f5371431c653a2528545957dc7293b18 Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Mon, 5 Nov 2012 20:34:09 +0000 Subject: [PATCH 07/57] Bookmark: Fetch title for bookmark added from interface ref #145 --- ajax/editBookmark.php | 11 +++++++++-- js/bookmarks.js | 6 ++++-- templates/list.php | 5 +++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ajax/editBookmark.php b/ajax/editBookmark.php index 3ac60707..12c2364c 100644 --- a/ajax/editBookmark.php +++ b/ajax/editBookmark.php @@ -26,20 +26,27 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); OCP\JSON::checkAppEnabled('bookmarks'); +require_once OC_App::getAppPath('bookmarks').'/bookmarksHelper.php'; // If we go the dialog form submit if(isset($_POST['url'])) { + $title = ''; $tags = isset($_POST['item']['tags']) ? $_POST['item']['tags'] : array(); $pub = isset($_POST['is_public']) ? true : false; if(isset($_POST['record_id']) && is_numeric($_POST['record_id']) ) { //EDIT $bm = $_POST['record_id']; OC_Bookmarks_Bookmarks::editBookmark($bm, $_POST['url'], $_POST['title'], $tags, $_POST['description'], $pub); + $title = $_POST['title']; } else { - $bm = OC_Bookmarks_Bookmarks::addBookmark($_POST['url'], $_POST['title'], $tags, $_POST['description'], $pub); + if(isset($_POST['from_own'])) { + $datas = getURLMetadata($_POST['url']); + if(isset($datas['title'])) $title = $datas['title']; + } + $bm = OC_Bookmarks_Bookmarks::addBookmark($_POST['url'], $title, $tags, $_POST['description'], $pub); } - OCP\JSON::success(array('id'=>$bm)); + OCP\JSON::success(array('id'=>$bm,'title'=>$title)); exit(); } OC_JSON::error(); diff --git a/js/bookmarks.js b/js/bookmarks.js index 15361b82..c8336f64 100644 --- a/js/bookmarks.js +++ b/js/bookmarks.js @@ -153,10 +153,11 @@ function getBookmarks() { for(var i in bookmarks.data) { updateBookmarksList(bookmarks.data[i]); - $("#firstrun").hide(); } if($('.bookmarks_list').is(':empty')) { $("#firstrun").show(); + } else { + $("#firstrun").hide(); } $('.bookmark_link').click(recordClick); @@ -196,7 +197,7 @@ function addBookmark(event) { event.preventDefault(); url = $('#add_url').val(); $('#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'), @@ -204,6 +205,7 @@ 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'); } diff --git a/templates/list.php b/templates/list.php index 107b3c85..c5ba03c5 100644 --- a/templates/list.php +++ b/templates/list.php @@ -9,8 +9,9 @@ ?>
-
- + + +
From 8d51d6425761e8ab278a4ed08763213a42ded2b2 Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Mon, 5 Nov 2012 20:38:48 +0000 Subject: [PATCH 08/57] Bookmark: Prevent exporting empty bookmarks fix #145 --- export.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/export.php b/export.php index ed9d5b21..fcf906be 100644 --- a/export.php +++ b/export.php @@ -22,10 +22,12 @@ Do Not Edit! -->

EOT; +$l = new OC_l10n('bookmarks'); +$unamed_label = $l->t('untitled'); $bookmarks = OC_Bookmarks_Bookmarks::findBookmarks(0, 'id', array(), true, -1); foreach($bookmarks as $bm) { $file .= '

'; - $file .= htmlspecialchars($bm['title'], ENT_QUOTES, 'UTF-8').''; + $file .= htmlspecialchars($unamed_label, ENT_QUOTES, 'UTF-8').''; if($bm['description']) $file .= '
'.htmlspecialchars($bm['description'], ENT_QUOTES, 'UTF-8'); } From 20a779eea92bfe74421c7250355578f96b4f740d Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Mon, 5 Nov 2012 20:48:28 +0000 Subject: [PATCH 09/57] Bookmark: Remove empty message when there is new bookmark fix #138 --- js/bookmarks.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/js/bookmarks.js b/js/bookmarks.js index c8336f64..8709fa41 100644 --- a/js/bookmarks.js +++ b/js/bookmarks.js @@ -154,11 +154,7 @@ function getBookmarks() { for(var i in bookmarks.data) { updateBookmarksList(bookmarks.data[i]); } - if($('.bookmarks_list').is(':empty')) { - $("#firstrun").show(); - } else { - $("#firstrun").hide(); - } + checkEmpty(); $('.bookmark_link').click(recordClick); $('.bookmark_delete').click(delBookmark); @@ -208,6 +204,7 @@ function addBookmark(event) { bookmark.title = data.title bookmark.added_date = new Date(); updateBookmarksList(bookmark, 'prepend'); + checkEmpty(); } } }); @@ -222,14 +219,19 @@ function delBookmark(event) { success: function(data){ if (data.status == 'success') { record.remove(); - if($('.bookmarks_list').is(':empty')) { - $("#firstrun").show(); - } + checkEmpty(); } } }); } +function checkEmpty() { + if($('.bookmarks_list').is(':empty')) { + $("#firstrun").show(); + } else { + $("#firstrun").hide(); + } +} function editBookmark(event) { if($('.bookmark_single_form').length){ $('.bookmark_single_form .reset').click(); From 8d69711a08ef0dcbe2ec0fdd974931a68ee9dc6d Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Mon, 5 Nov 2012 21:12:00 +0000 Subject: [PATCH 10/57] Bookmark: prevent adding empty bookmarks fix #149 --- css/bookmarks.css | 6 ++++++ js/bookmarks.js | 30 +++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/css/bookmarks.css b/css/bookmarks.css index f88d5365..2ba82133 100644 --- a/css/bookmarks.css +++ b/css/bookmarks.css @@ -4,6 +4,12 @@ #firstrun .button { font-size: 0.7em; } #firstrun #selections { font-size:0.8em; font-weight: normal; width: 100%; margin: 2em auto auto auto; clear: both; } + +input.disabled, input.disabled:hover { + cursor: not-allowed; + background-color: #ddd; + color: gray; +} #leftcontent { padding-top: 1em; } diff --git a/js/bookmarks.js b/js/bookmarks.js index 8709fa41..15def460 100644 --- a/js/bookmarks.js +++ b/js/bookmarks.js @@ -6,12 +6,12 @@ var bookmarks_sorting = 'bookmarks_sorting_recent'; var bookmark_view = 'image'; $(document).ready(function() { + watchUrlField(); $('.centercontent').click(clickSideBar); $('#view_type input').click(clickSwitchView); - $('#add_form').submit(addBookmark); - -// $('#bm_import_submit').click(attachSettingEvent); + $('#bm_import').change(attachSettingEvent); + $('#add_url').on('keydown keyup change click', watchUrlField); $('#settingsbtn').on('click keydown', function() { if( $('#bookmark_settings').hasClass('open')) $('#bookmark_settings').switchClass( "open", "" ); @@ -189,9 +189,33 @@ 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:'', from_own: '1'}; $.ajax({ From f8e3a0c2e7c6d72f9617a95de185042b512ce1e2 Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Mon, 5 Nov 2012 21:22:42 +0000 Subject: [PATCH 11/57] Remove sliding panel feature and old dead code fix #137 --- ajax/changescreen.php | 29 -------------- css/bookmarks.css | 41 ------------------- js/bookmarks.js | 92 +++++++------------------------------------ templates/js_tpl.php | 21 ---------- templates/list.php | 13 ------ 5 files changed, 14 insertions(+), 182 deletions(-) delete mode 100644 ajax/changescreen.php diff --git a/ajax/changescreen.php b/ajax/changescreen.php deleted file mode 100644 index 116b9822..00000000 --- a/ajax/changescreen.php +++ /dev/null @@ -1,29 +0,0 @@ -'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(); -} diff --git a/css/bookmarks.css b/css/bookmarks.css index 2ba82133..896421d3 100644 --- a/css/bookmarks.css +++ b/css/bookmarks.css @@ -18,20 +18,6 @@ input.disabled, input.disabled:hover { padding-top: 5px; top: 3.5em !important; } -.centercontent { - margin-bottom: 1em; - text-align: right; -} -.centercontent span { - border: 1px solid lightgray; - border-right:0; - border-radius: 0.5em 0em 0em 0.5em; - padding: 3px; -} - -.centercontent .right_img { - display:none; -} .bookmarks_headline { font-size: large; @@ -246,33 +232,6 @@ li:hover em { display : none; } top: 50%; } -#view_type { - display:none; /* @TODO: Remove when image view is ready*/ - position: absolute; - right: 33.5em; - top: 0; -} - -/***** Lis View *****/ - -.bm_view_img .bookmark_single{ - width: 240px; - float: left; - height: 240px; - margin: 1em; - border-radius: 8px 8px 8px 8px; - box-shadow: 0 0 5px rgba(34, 25, 25, 0.5); -} - -.bm_view_img .bookmark_single .shot{ - text-align:center; -} -.bm_view_img .bookmark_single .shot img{ - border: 1px solid black; - width: 228px; - height: 160px -} - .bookmark_desc{ height: 1.5em; padding-left:1em; diff --git a/js/bookmarks.js b/js/bookmarks.js index 15def460..a4673c55 100644 --- a/js/bookmarks.js +++ b/js/bookmarks.js @@ -7,8 +7,6 @@ var bookmark_view = 'image'; $(document).ready(function() { watchUrlField(); - $('.centercontent').click(clickSideBar); - $('#view_type input').click(clickSwitchView); $('#bm_import').change(attachSettingEvent); $('#add_url').on('keydown keyup change click', watchUrlField); @@ -31,11 +29,6 @@ $(document).ready(function() { onTagFinishRemoved: filterTagsChanged }).tagit('option', 'onTagAdded', filterTagsChanged); getBookmarks(); - - if(init_sidebar != 'true') - toggleSideBar(); - bookmark_view = init_view; - switchView(); }); @@ -51,51 +44,6 @@ var formatString = (function() { }; })(); -function clickSideBar() { - $.post(OC.filePath('bookmarks', 'ajax', 'changescreen.php'), {sidebar: $('.right_img').is(':visible')}); - toggleSideBar(); -} - -function toggleSideBar(){ - var left_pan_visible = $('.right_img').is(':visible'); - anim_duration = 1000; - if( left_pan_visible) { // then show the left panel - $('#rightcontent').animate({'left':'32.5em'},{duration: anim_duration, queue: false }); - $('.bookmarks_list').animate({'width': '-=15em'},{duration: anim_duration, queue: false }); - $('#leftcontent').animate({'margin-left':'0', 'opacity': 1},{duration: anim_duration, queue: false, complete: function() { $(window).trigger('resize'); }}); - $('.right_img').hide(); - $('.left_img').show(); - - } else { // hide the left panel - $('#rightcontent').animate({'left':'15.5em'},{duration: anim_duration, queue: false }); - $('.bookmarks_list').animate({'width': '+=15em'},{duration: anim_duration, queue: false }); - $('#leftcontent').animate({'margin-left':'-17em', 'opacity': 0.5 },{duration: anim_duration, queue: false, complete: function() { $(window).trigger('resize'); } }); - $('.left_img').hide(); - $('.right_img').show(); - } -} - -function clickSwitchView(){ - $.post(OC.filePath('bookmarks', 'ajax', 'changescreen.php'), {view:bookmark_view}); - switchView(); -} - -function switchView(){ - if(bookmark_view == 'list') { //Then switch to img - $('.bookmarks_list').addClass('bm_view_img'); - $('.bookmarks_list').removeClass('bm_view_list'); - $('#view_type input.image').hide(); - $('#view_type input.list').show(); - bookmark_view = 'image'; - } else { // Then Image - $('.bookmarks_list').addClass('bm_view_list'); - $('.bookmarks_list').removeClass('bm_view_img'); - $('#view_type input.list').hide(); - $('#view_type input.image').show(); - bookmark_view = 'list'; - } - filterTagsChanged(); //Refresh the view -} function addFilterTag(event) { event.preventDefault(); $('#tag_filter input').tagit('createTag', $(this).text()); @@ -229,6 +177,7 @@ function addBookmark(event) { bookmark.added_date = new Date(); updateBookmarksList(bookmark, 'prepend'); checkEmpty(); + watchUrlField(); } } }); @@ -318,35 +267,22 @@ function updateBookmarksList(bookmark, position) { bookmark.added_date.setTime(parseInt(bookmark.added)*1000); } - if(bookmark_view == 'image') { //View in images - service_url = formatString(shot_provider, {url: encodeEntities(bookmark.url), title: bookmark.title, width: 200}); - bookmark['service_url'] = service_url; - html = tmpl("img_item_tmpl", bookmark); + html = tmpl("item_tmpl", bookmark); + if(position == "prepend") { + $('.bookmarks_list').prepend(html); + } else { $('.bookmarks_list').append(html); - $('div[data-id="'+ bookmark.id +'"]').data('record', bookmark); - if(taglist != '') { - $('div[data-id="'+ bookmark.id +'"]').append('

' + taglist + '

'); - } - $('div[data-id="'+ bookmark.id +'"] a.bookmark_tag').bind('click', addFilterTag); } - else { - html = tmpl("item_tmpl", bookmark); - if(position == "prepend") { - $('.bookmarks_list').prepend(html); - } else { - $('.bookmarks_list').append(html); - } - line = $('div[data-id="'+ bookmark.id +'"]'); - line.data('record', bookmark); - if(taglist != '') { - line.append('

' + taglist + '

'); - } - line.find('a.bookmark_tag').bind('click', addFilterTag); - line.find('.bookmark_link').click(recordClick); - line.find('.bookmark_delete').click(delBookmark); - line.find('.bookmark_edit').click(editBookmark); + line = $('div[data-id="'+ bookmark.id +'"]'); + line.data('record', bookmark); + if(taglist != '') { + line.append('

' + taglist + '

'); } - + line.find('a.bookmark_tag').bind('click', addFilterTag); + line.find('.bookmark_link').click(recordClick); + line.find('.bookmark_delete').click(delBookmark); + line.find('.bookmark_edit').click(editBookmark); + } function updateOnBottom() { diff --git a/templates/js_tpl.php b/templates/js_tpl.php index 55d211f2..f7f6a9b3 100644 --- a/templates/js_tpl.php +++ b/templates/js_tpl.php @@ -66,25 +66,4 @@

<%= nbr %> - - \ No newline at end of file diff --git a/templates/list.php b/templates/list.php index c5ba03c5..f0c5ae2f 100644 --- a/templates/list.php +++ b/templates/list.php @@ -13,16 +13,8 @@ -
- - -
-
- t('Hide')?> << - t('Show')?> >> -

@@ -60,11 +52,6 @@

From 2462d34a4260c2a702e2a68529af8d21fb91dd76 Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Tue, 6 Nov 2012 21:05:30 +0000 Subject: [PATCH 18/57] Bookmark: Remove depr. function fillWindow, ref #73 Thanks Raydiation for the hint --- css/bookmarks.css | 7 +++++-- js/bookmarks.js | 5 +---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/css/bookmarks.css b/css/bookmarks.css index aa83227a..851f052d 100644 --- a/css/bookmarks.css +++ b/css/bookmarks.css @@ -33,8 +33,11 @@ input.disabled, input.disabled:hover { .bookmarks_list { overflow: auto; - position: fixed; - top: 6.5em; + -moz-box-sizing: border-box; + box-sizing: border-box; + padding-top: 3em; + width: 100%; + height: 100%; } #add_url { diff --git a/js/bookmarks.js b/js/bookmarks.js index 189765e2..a3af1075 100644 --- a/js/bookmarks.js +++ b/js/bookmarks.js @@ -10,11 +10,8 @@ $(document).ready(function() { $('#settingsbtn').on('click keydown', toggleSettings); $('#bm_export').click(exportBm); - $(window).resize(function () { - fillWindow($('.bookmarks_list')); - }); $(window).resize(); - $('.bookmarks_list').scroll(updateOnBottom).empty().width($('#rightcontent').width()); + $('.bookmarks_list').scroll(updateOnBottom).empty(); $('#tag_filter input').tagit({ allowSpaces: true, availableTags: fullTags, From 4b7fd9ab1d9dda8f2b0999f975e01303fea27749 Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Wed, 7 Nov 2012 02:16:56 +0530 Subject: [PATCH 19/57] Fixes https://github.com/owncloud/apps/issues/143 The edit button come besides title + url --- css/bookmarks.css | 14 ++++++++++++-- templates/js_tpl.php | 12 ++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/css/bookmarks.css b/css/bookmarks.css index 851f052d..8d91f433 100644 --- a/css/bookmarks.css +++ b/css/bookmarks.css @@ -66,11 +66,13 @@ input.disabled, input.disabled:hover { .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; - min-height: 3em; padding: 0.5em 1em; + min-height: 3em; border-bottom: 1px solid #DDD; -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; } @@ -237,7 +239,7 @@ li:hover em { display : none; } } .bookmark_desc{ -/* height: 1.5em; */ + height: 1.5em; padding-left:1em; white-space:nowrap; text-overflow:ellipsis; @@ -253,6 +255,14 @@ li:hover em { display : none; } margin-right: 0.2em; } +/* +.bm_view_img .bookmark_single:hover .bookmark_url{ + display:block; +} +.bm_view_img .bookmark_single .bookmark_url{ + display:block; +} +*/ .bookmark_single:hover .bookmark_url { display: inline; } .bookmark_single:hover .bookmark_url a[href]{ color:gray; } diff --git a/templates/js_tpl.php b/templates/js_tpl.php index 3f997015..6c0b5b62 100644 --- a/templates/js_tpl.php +++ b/templates/js_tpl.php @@ -1,10 +1,6 @@ From 9ad3ff5a95ba546322299f92d8053fad4323496e Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Tue, 6 Nov 2012 21:37:48 +0000 Subject: [PATCH 20/57] Bookmark: Quick indent style fix --- templates/js_tpl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/js_tpl.php b/templates/js_tpl.php index 6c0b5b62..795bbca1 100644 --- a/templates/js_tpl.php +++ b/templates/js_tpl.php @@ -9,13 +9,13 @@

<%= encodeEntities(title == '' ? url : title ) %> - +

<%= encodeEntities(title == '' ? '' : url) %> - + " title="t('Edit');?>"> From 58fbba8a3f772619a1a3dd2dac3f3bce91838169 Mon Sep 17 00:00:00 2001 From: Raghu Nayyar Date: Wed, 7 Nov 2012 03:19:58 +0530 Subject: [PATCH 21/57] Update bookmarks/js/bookmarks.js Removed trailing comma --- js/bookmarks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/bookmarks.js b/js/bookmarks.js index a3af1075..98a284ea 100644 --- a/js/bookmarks.js +++ b/js/bookmarks.js @@ -304,7 +304,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')) }); } From a6c2e662cd67178bbf182361652af2848f536cb7 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 7 Nov 2012 00:04:41 +0100 Subject: [PATCH 22/57] [tx-robot] updated from transifex --- l10n/fi_FI.php | 3 ++- l10n/ru_RU.php | 4 +++- l10n/si_LK.php | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/l10n/fi_FI.php b/l10n/fi_FI.php index 0ebe393b..f757d361 100644 --- a/l10n/fi_FI.php +++ b/l10n/fi_FI.php @@ -14,14 +14,15 @@ "The address of the page" => "Sivun osoite", "Description of the page" => "Sivun kuvaus", "Save" => "Tallenna", -"Edit" => "Muokkaa", "Delete" => "Poista", +"Edit" => "Muokkaa", "Cancel" => "Peru", "Address" => "Osoite", "Add bookmark" => "Lisää kirjanmerkki", "Related Tags" => "Vastaavanlaiset tunnisteet", "Settings" => "Asetukset", "You have no bookmarks" => "Sinulla ei ole kirjanmerkkejä", +"Bookmarklet" => "Kirjanmerkitsin", "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Vedä tämä selaimesi kirjanmerkkipalkkiin ja napsauta sitä, kun haluat lisätä kirjanmerkin nopeasti:", "Read later" => "Lue myöhemmin", "Export & Import" => "Vienti ja tuonti", diff --git a/l10n/ru_RU.php b/l10n/ru_RU.php index 13ee42e0..0e607af8 100644 --- a/l10n/ru_RU.php +++ b/l10n/ru_RU.php @@ -14,16 +14,18 @@ "The address of the page" => "Адрес страницы", "Description of the page" => "Описание страницы", "Save" => "Сохранить", -"Edit" => "Редактировать", "Delete" => "Удалить", +"Edit" => "Редактировать", "Cancel" => "Отмена", "Address" => "Адрес", "Add bookmark" => "Добавить закладку", "Related Tags" => "Связанные теги", "Settings" => "Настройки", "You have no bookmarks" => "У Вас нет закладок", +"Bookmarklet" => "Bookmarklet", "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Перетащите это в закладки Вашего браузера и кликните на него, когда захотите быстро добавить страницу в закладки:", "Read later" => "Прочитать позже", +"Export & Import" => "Экспорт & Импорт", "Export" => "Экспортировать", "Import" => "Импортировать" ); diff --git a/l10n/si_LK.php b/l10n/si_LK.php index 0083cb1c..c7954f76 100644 --- a/l10n/si_LK.php +++ b/l10n/si_LK.php @@ -14,8 +14,8 @@ "The address of the page" => "පිටුවේ ලිපිනය", "Description of the page" => "පිටුවේ විස්තර", "Save" => "සුරකින්න", -"Edit" => "සකසන්න", "Delete" => "මකන්න", +"Edit" => "සකසන්න", "Cancel" => "එපා", "Address" => "ලිපිනය", "Add bookmark" => "පිටුසන එකතුකරන්න", @@ -24,6 +24,7 @@ "You have no bookmarks" => "පිටු සළකුනු නොමැත", "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "මෙම වෙබ් පිටුව ඉක්මනින් පිටු සළකුනක් ලෙස සටහන් කිරීමට, එය බ්‍රවුසරයේ පිටු සළකුනු මතට ඇද ක්ලික් කරන්න:", "Read later" => "පසුව කියවීමට", +"Export & Import" => "ආයාත හා නිර්යාත", "Export" => "නිර්යාත කරන්න", "Import" => "ආයාත කරන්න" ); From 85ba9207d8bc0c6f55d48ad7284d61cc8b3dd965 Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Tue, 6 Nov 2012 23:05:52 +0000 Subject: [PATCH 23/57] Bookmark: Remove top control bar and few others. fix #162 --- css/bookmarks.css | 9 ++++++--- js/bookmarks.js | 3 ++- templates/list.php | 15 +++++++-------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/css/bookmarks.css b/css/bookmarks.css index 8d91f433..618d419c 100644 --- a/css/bookmarks.css +++ b/css/bookmarks.css @@ -11,12 +11,12 @@ input.disabled, input.disabled:hover { color: gray; } #leftcontent { - padding-top: 1em; + top: 4em !important; } #rightcontent { padding-top: 5px; - top: 3.5em !important; + top: 1em !important; } .bookmarks_headline { @@ -40,8 +40,11 @@ input.disabled, input.disabled:hover { height: 100%; } +#add_form { + padding-bottom: 2em; +} #add_url { - width: 25em; + width: 12em; } .bookmarks_addBml { text-decoration: underline; diff --git a/js/bookmarks.js b/js/bookmarks.js index 98a284ea..b7427353 100644 --- a/js/bookmarks.js +++ b/js/bookmarks.js @@ -15,7 +15,8 @@ $(document).ready(function() { $('#tag_filter input').tagit({ allowSpaces: true, availableTags: fullTags, - onTagFinishRemoved: filterTagsChanged + onTagFinishRemoved: filterTagsChanged, + placeholderText: t('bookmark', 'Filter by tag') }).tagit('option', 'onTagAdded', filterTagsChanged); getBookmarks(); }); diff --git a/templates/list.php b/templates/list.php index ae8b2df9..079d49c1 100644 --- a/templates/list.php +++ b/templates/list.php @@ -7,17 +7,16 @@ * See the COPYING-README file. */ ?> - -

-
- - -
-
+
+
+ + +
+

- +

From e78fc2baa08543bdd6d3b59be6e7d14bb53b5e7e Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Tue, 6 Nov 2012 23:52:14 +0000 Subject: [PATCH 24/57] Bookmark: Display bmlet if there is not bookmarks yet fix #136 --- css/bookmarks.css | 6 +++--- js/bookmarks.js | 7 +++++-- templates/list.php | 20 ++++++++++++++------ templates/settings.php | 10 +--------- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/css/bookmarks.css b/css/bookmarks.css index 618d419c..c2acb06c 100644 --- a/css/bookmarks.css +++ b/css/bookmarks.css @@ -1,9 +1,9 @@ #content { overflow: auto; height: 100%; } -#firstrun { width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em; color:#777; position: relative;} -#firstrun small { display: block; font-weight: normal; font-size: 0.5em; margin-bottom: 1.5em; } +#firstrun, #firstrun_setting{ width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em; color:#777; position: relative;} +#firstrun small { display: block; font-weight: normal; font-size: 0.5em; } #firstrun .button { font-size: 0.7em; } #firstrun #selections { font-size:0.8em; font-weight: normal; width: 100%; margin: 2em auto auto auto; clear: both; } - +#firstrun_setting { font-size: 100%; text-decoration: underline} input.disabled, input.disabled:hover { cursor: not-allowed; diff --git a/js/bookmarks.js b/js/bookmarks.js index b7427353..f0713a0f 100644 --- a/js/bookmarks.js +++ b/js/bookmarks.js @@ -9,8 +9,11 @@ $(document).ready(function() { $('#add_url').on('keydown keyup change click', watchUrlField); $('#settingsbtn').on('click keydown', toggleSettings); $('#bm_export').click(exportBm); - - $(window).resize(); + $('#firstrun_setting').click(function(){ + if(! $('#bookmark_settings').hasClass('open')){ + $('#settingsbtn').click(); + } + }); $('.bookmarks_list').scroll(updateOnBottom).empty(); $('#tag_filter input').tagit({ allowSpaces: true, diff --git a/templates/list.php b/templates/list.php index 079d49c1..2aeeab55 100644 --- a/templates/list.php +++ b/templates/list.php @@ -6,6 +6,14 @@ * 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 ''.$help_msg.'
' . $l->t('Read later') . ''; +} ?>
@@ -39,15 +47,15 @@
-
From 618eb1fde3e9c7902de12352f6d7cf8e113f6dff Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Sun, 18 Nov 2012 14:17:38 +0530 Subject: [PATCH 45/57] Title and description if long gets hidden, edit button works fine. --- css/bookmarks.css | 26 +++++++++++++++++++------- templates/js_tpl.php | 6 ++++++ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/css/bookmarks.css b/css/bookmarks.css index 65814af4..065f7f6c 100644 --- a/css/bookmarks.css +++ b/css/bookmarks.css @@ -88,10 +88,21 @@ input.disabled, input.disabled:hover, input.disabled:focus { display: block; } +.bookmark_edit_btn { + float: left; + position: absolute; + top: 0.6em; + left: 10em; +} + .bookmark_title { - font-weight: bold; - display: inline-block; - margin-right: 0.8em; + font-weight: bold; + display: inline-block; + margin-right: 0.8em; + width: 8em; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; } .bm_view_list .bookmark_tags { @@ -102,7 +113,7 @@ input.disabled, input.disabled:hover, input.disabled:focus { } .bookmark_tags { - margin-left:7em; + margin-left:11em; position: absolute; } .bookmark_tag { @@ -252,11 +263,12 @@ li:hover em { display : none; } text-overflow:ellipsis; overflow:hidden; display:block; - float: left; + float:left; position: absolute; - left: 7em; - width:30em; + left: 11em; + max-width:30em; top: 0.7em; + font-weight:500; } .bookmark_date, .bookmark_submit { font-size:small; diff --git a/templates/js_tpl.php b/templates/js_tpl.php index a5b1bc7d..2c71b7ee 100644 --- a/templates/js_tpl.php +++ b/templates/js_tpl.php @@ -17,6 +17,12 @@ <%= encodeEntities(description)%> <%= formatDate(added_date) %>

+
+ + " + title="t('Edit');?>"> + +
From 853fbcf4d2e47c77671ef42b18124e22212ff333 Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Tue, 20 Nov 2012 01:16:52 +0530 Subject: [PATCH 46/57] Relative lengths of Bookmark Elements. Tried my best that no overlapping happs for larger widths, removed the second edit button too. --- css/bookmarks.css | 10 +++++----- templates/js_tpl.php | 4 ---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/css/bookmarks.css b/css/bookmarks.css index 065f7f6c..c0c818ef 100644 --- a/css/bookmarks.css +++ b/css/bookmarks.css @@ -92,14 +92,14 @@ input.disabled, input.disabled:hover, input.disabled:focus { float: left; position: absolute; top: 0.6em; - left: 10em; + left: 20%; } .bookmark_title { font-weight: bold; display: inline-block; margin-right: 0.8em; - width: 8em; + width: 20%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; @@ -113,7 +113,7 @@ input.disabled, input.disabled:hover, input.disabled:focus { } .bookmark_tags { - margin-left:11em; + left:25%; position: absolute; } .bookmark_tag { @@ -265,8 +265,8 @@ li:hover em { display : none; } display:block; float:left; position: absolute; - left: 11em; - max-width:30em; + left: 25%; + width:40%; top: 0.7em; font-weight:500; } diff --git a/templates/js_tpl.php b/templates/js_tpl.php index 2c71b7ee..365ca467 100644 --- a/templates/js_tpl.php +++ b/templates/js_tpl.php @@ -10,10 +10,6 @@ <%= encodeEntities(title == '' ? url : title ) %> - - " - title="t('Edit');?>"> - <%= encodeEntities(description)%> <%= formatDate(added_date) %>

From 142fdc2e994c62c447420fff8a75f2fcb1c7704f Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Thu, 22 Nov 2012 21:10:31 +0000 Subject: [PATCH 47/57] Bookmark: Small style Fix #158 --- css/bookmarks.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/css/bookmarks.css b/css/bookmarks.css index c0c818ef..9ce32db2 100644 --- a/css/bookmarks.css +++ b/css/bookmarks.css @@ -74,7 +74,7 @@ input.disabled, input.disabled:hover, input.disabled:focus { .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; @@ -89,10 +89,9 @@ input.disabled, input.disabled:hover, input.disabled:focus { } .bookmark_edit_btn { - float: left; position: absolute; top: 0.6em; - left: 20%; + left: 21%; } .bookmark_title { From c81a01428caffc1c2b312214c3b6e0b9ac96028f Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Fri, 23 Nov 2012 00:03:23 +0100 Subject: [PATCH 48/57] [tx-robot] updated from transifex --- l10n/th_TH.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/l10n/th_TH.php b/l10n/th_TH.php index 08851269..587dde6d 100644 --- a/l10n/th_TH.php +++ b/l10n/th_TH.php @@ -1,9 +1,13 @@ "ประเภทของไฟล์ที่ต้องการนำเข้าไม่ได้รับการรองรับให้ใช้งาน", "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" => "ปิด", @@ -21,6 +25,9 @@ "Related Tags" => "ป้ายกำกับอื่นๆที่เกี่ยวข้อง", "Settings" => "ตั้งค่า", "You have no bookmarks" => "คุณยังไม่มีรายการโปรด", +"You can also try to import a bookmark file" => "คุณสามารถที่จะลองนำเข้าไฟล์รายการโปรดได้ด้วยเช่นกัน", +"Bookmarklet" => "Bookmarklet", +"Export & Import" => "ส่งออก & นำเข้า", "Export" => "ส่งออก", "Import" => "นำเข้า" ); From 05eea166cb7c97caf8698b7324635f54637d92cf Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 24 Nov 2012 00:01:42 +0100 Subject: [PATCH 49/57] [tx-robot] updated from transifex --- l10n/eo.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/l10n/eo.php b/l10n/eo.php index 04fc7c2f..8e0cc8ca 100644 --- a/l10n/eo.php +++ b/l10n/eo.php @@ -1,9 +1,13 @@ "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", @@ -21,6 +25,9 @@ "Related Tags" => "Rilataj etikedoj", "Settings" => "Agordo", "You have no bookmarks" => "Vi havas neniun legosignon", +"You can also try to import a bookmark file" => "Vi povas ankaŭ provi enporti legosignan dosieron", +"Bookmarklet" => "Kodosigno", +"Export & Import" => "Malenporti kaj enporti", "Export" => "Elporti", "Import" => "Enporti" ); From c43ff731e44d6f4d78a19aba2952e7ac28c05492 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Tue, 27 Nov 2012 00:09:28 +0100 Subject: [PATCH 50/57] [tx-robot] updated from transifex --- l10n/eu.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/l10n/eu.php b/l10n/eu.php index c4b80be0..d93bb08d 100644 --- a/l10n/eu.php +++ b/l10n/eu.php @@ -1,9 +1,13 @@ "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", @@ -21,6 +25,8 @@ "Related Tags" => "Erlazionatutako etiketak", "Settings" => "Ezarpenak", "You have no bookmarks" => "Ez duzu laster-markarik", +"You can also try to import a bookmark file" => "Laster-marka fitxategi bat inportatzen saia zaitezke", +"Export & Import" => "Exportatu eta inportatu", "Export" => "Exportatu", "Import" => "Inportatu" ); From 8687318f2c2332f0d5911cacc1240deef2cd8f98 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 28 Nov 2012 00:10:07 +0100 Subject: [PATCH 51/57] [tx-robot] updated from transifex --- l10n/uk.php | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/l10n/uk.php b/l10n/uk.php index d7cabfdf..9047b504 100644 --- a/l10n/uk.php +++ b/l10n/uk.php @@ -1,16 +1,33 @@ "Імпорт файлу даного типу не підтримується", "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" => "Зберегти", "Delete" => "Видалити", "Edit" => "Редагувати", "Cancel" => "Відмінити", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Перетягніть це в закладки вашого броузера і клікніть для того, щоб швидко закласти web-сторінку:", "Read later" => "Прочитати пізніше", "Address" => "Адреса", "Add" => "Додати", +"Related Tags" => "Пов'язані теги", "Settings" => "Налаштування", -"You have no bookmarks" => "У вас нема закладок", +"You have no bookmarks" => "У вас немає закладок", +"You can also try to import a bookmark file" => "Ви можете також спробувати імпортувати файл закладок", +"Bookmarklet" => "Закладка-аплет", +"Export & Import" => "Експорт та Імпорт", "Export" => "Експорт", "Import" => "Імпорт" ); From ceed11431aefe9d4cde0da52c8b5bcfb5aafec01 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Thu, 29 Nov 2012 00:03:57 +0100 Subject: [PATCH 52/57] [tx-robot] updated from transifex --- l10n/zh_TW.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/l10n/zh_TW.php b/l10n/zh_TW.php index c40d5f25..f52f67a1 100644 --- a/l10n/zh_TW.php +++ b/l10n/zh_TW.php @@ -1,7 +1,14 @@ "書籤", "Tags" => "標籤", +"Filter by tag" => "依標籤篩選", +"Edit bookmark" => "編輯書籤", +"Warning" => "警告", +"Uploading..." => "上傳中...", +"Add a bookmark" => "新增書籤", "Close" => "關閉", +"The title of the page" => "頁面標題", +"Description of the page" => "頁面說明", "Save" => "儲存", "Delete" => "刪除", "Edit" => "編輯", @@ -10,8 +17,11 @@ "Read later" => "稍後閱讀", "Address" => "網址", "Add" => "新增", +"Related Tags" => "相關標籤", "Settings" => "設定", "You have no bookmarks" => "你沒有書籤", +"You can also try to import a bookmark file" => "您也可以匯入書籤檔", +"Export & Import" => "匯出與匯入", "Export" => "匯出", "Import" => "匯入" ); From dd885c81f2f6a995292c2143057baba0ff277cb7 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 2 Dec 2012 00:02:25 +0100 Subject: [PATCH 53/57] [tx-robot] updated from transifex --- l10n/sk_SK.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/l10n/sk_SK.php b/l10n/sk_SK.php index 9a5539c8..39a1c00d 100644 --- a/l10n/sk_SK.php +++ b/l10n/sk_SK.php @@ -2,6 +2,7 @@ "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", @@ -24,6 +25,9 @@ "Related Tags" => "Podobné značky", "Settings" => "Nastavenia", "You have no bookmarks" => "Nemáte záložky", +"You can also try to import a bookmark file" => "Môžte tiež skúsiť import súboru zo záložkami.", +"Bookmarklet" => "Bookmarklet", +"Export & Import" => "Export & Import", "Export" => "Export", "Import" => "Import" ); From cfb9a4f6e0e3053749bde85c3135f233c9f5c59c Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 5 Dec 2012 00:03:40 +0100 Subject: [PATCH 54/57] [tx-robot] updated from transifex --- l10n/sr.php | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/l10n/sr.php b/l10n/sr.php index abb6625f..24488ac3 100644 --- a/l10n/sr.php +++ b/l10n/sr.php @@ -1,10 +1,33 @@ "Неподржана врста датотеке за увоз", +"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" => "Сними", "Delete" => "Обриши", "Edit" => "Уреди", "Cancel" => "Откажи", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Превуците ово у ваш прегледач и кликните уколико желите да обележите ову веб страницу на брзину:", +"Read later" => "Прочитаћу касније", "Address" => "Адреса", "Add" => "Додај", -"Settings" => "Подешавања" +"Related Tags" => "Повезане ознаке", +"Settings" => "Подешавања", +"You have no bookmarks" => "Немате обележиваче", +"You can also try to import a bookmark file" => "Можете такође пробати са увозом датотеке са обележивачима", +"Bookmarklet" => "Маркер", +"Export & Import" => "Извоз и увоз", +"Export" => "Извези", +"Import" => "Увези" ); From 841c2df4e6c5b896933ad4bbf6bb918a4f7ae858 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 8 Dec 2012 00:08:12 +0100 Subject: [PATCH 55/57] [tx-robot] updated from transifex --- l10n/gl.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/l10n/gl.php b/l10n/gl.php index d2673fa7..5054ffe7 100644 --- a/l10n/gl.php +++ b/l10n/gl.php @@ -1,32 +1,32 @@ "Tipo de ficheiro sen soporte para a importación", +"Unsupported file type for import" => "Tipo de ficheiro non admitido para a importación", "Bookmarks" => "Marcadores", "Tags" => "Etiquetas", "Filter by tag" => "Filtrar segundo a etiqueta", "Edit bookmark" => "Editar o marcador", -"Are you sure you want to remove this tag from every entry?" => "Seguro que queres eliminar esta etiqueta de todas as entradas?", -"Warning" => "Advertencia", -"Import completed successfully." => "Completouse a importación correctamente.", +"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" => "A dirección desta páxina", +"The address of the page" => "O enderezo desta páxina", "Description of the page" => "Descrición da páxina", "Save" => "Gardar", "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 teu navegador e pulse nel cando queira marcar unha páxina con rapidez:", +"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", "Add" => "Engadir", "Related Tags" => "Etiquetas relacionadas", "Settings" => "Preferencias", "You have no bookmarks" => "Non ten marcadores", -"You can also try to import a bookmark file" => "Tamén podes intentar importar un ficheiro de marcadores", -"Bookmarklet" => "Bookmarklet", +"You can also try to import a bookmark file" => "Tamén pode intentar importar un ficheiro de marcadores", +"Bookmarklet" => "Marcador", "Export & Import" => "Exportar e importar", "Export" => "Exportar", "Import" => "Importar" From 34cea68425079e7c81d0db4e565639b2517347d4 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Mon, 10 Dec 2012 00:08:34 +0100 Subject: [PATCH 56/57] [tx-robot] updated from transifex --- l10n/ko.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/l10n/ko.php b/l10n/ko.php index e14459c4..cc5a85c6 100644 --- a/l10n/ko.php +++ b/l10n/ko.php @@ -1,32 +1,32 @@ "가져오기가 지원되지 않는 파일타입 입니다.", -"Bookmarks" => "즐겨찾기", +"Unsupported file type for import" => "가져올 수 없는 파일 형식임", +"Bookmarks" => "책갈피", "Tags" => "태그", "Filter by tag" => "태그로 필터링", -"Edit bookmark" => "북마크 편집", -"Are you sure you want to remove this tag from every entry?" => "정말로 이 태그를 모든 엔트리에서 제거하기를 원하십니까?", +"Edit bookmark" => "책갈피 편집", +"Are you sure you want to remove this tag from every entry?" => "모든 항목에서 이 태그를 삭제하시겠습니까?", "Warning" => "경고", -"Import completed successfully." => "가져오기가 성공적으로 끝났습니다.", -"Uploading..." => "업로드중...", -"Bookm." => "Bookm.", -"Add a bookmark" => "북마크 추가", +"Import completed successfully." => "성공적으로 가져왔습니다.", +"Uploading..." => "업로드 중...", +"Bookm." => "책갈피", +"Add a bookmark" => "책갈피 추가", "Close" => "닫기", -"The title of the page" => "페이지의 제목", -"The address of the page" => "페이지의 주소", -"Description of the page" => "페이지의 설명", +"The title of the page" => "페이지 제목", +"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:" => "웹페이지를 빠르게 북마크하길 원한다면, 당신의 브라우저 북마크에 이것을 드래그 하고 클릭하세요.", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "웹 브라우저 책갈피 항목에 다음 링크를 끌어다 놓으면 나중에 볼 웹 페이지를 빠르게 구독할 때 사용할 수 있습니다:", "Read later" => "나중에 읽기", "Address" => "주소", "Add" => "추가", "Related Tags" => "관련된 태그", "Settings" => "설정", -"You have no bookmarks" => "북마크가 없습니다.", -"You can also try to import a bookmark file" => "당신은 즐겨 찾기 파일을 가져올 수 있습니다.", -"Bookmarklet" => "즐겨찾기 모음", +"You have no bookmarks" => "책갈피가 없습니다", +"You can also try to import a bookmark file" => "책갈피 파일을 가져올 수 있습니다", +"Bookmarklet" => "북마크릿", "Export & Import" => "내보내기 & 가져오기", "Export" => "내보내기", "Import" => "가져오기" From c43808ac44f1e7f9a7de03b985f6ee4483988f51 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Fri, 14 Dec 2012 00:16:10 +0100 Subject: [PATCH 57/57] [tx-robot] updated from transifex --- l10n/eu.php | 1 + 1 file changed, 1 insertion(+) diff --git a/l10n/eu.php b/l10n/eu.php index d93bb08d..5e3afe4a 100644 --- a/l10n/eu.php +++ b/l10n/eu.php @@ -26,6 +26,7 @@ "Settings" => "Ezarpenak", "You have no bookmarks" => "Ez duzu laster-markarik", "You can also try to import a bookmark file" => "Laster-marka fitxategi bat inportatzen saia zaitezke", +"Bookmarklet" => "Bookmarklet", "Export & Import" => "Exportatu eta inportatu", "Export" => "Exportatu", "Import" => "Inportatu"