diff -Nru focuswriter-1.5.2/ChangeLog focuswriter-1.5.3/ChangeLog --- focuswriter-1.5.2/ChangeLog 2014-07-20 13:40:54.000000000 +0000 +++ focuswriter-1.5.3/ChangeLog 2014-08-17 12:53:00.000000000 +0000 @@ -1,3 +1,45 @@ +commit 7a46d091242363677fa1716fa4078fdd84ee73b6 +Author: Graeme Gott +Date: 2014-08-17 + + Bump version number. + +commit 7960052884c5a99b905d7cd1cda4c24c619aa3de +Author: Graeme Gott +Date: 2014-08-16 + + Sync translations with Transifex. + +commit 99d1e11ae1a428c4f72349e39b2f15e2ba69ecca +Author: Graeme Gott +Date: 2014-08-16 + + FIXED: Find did not take smart quotes into account. + +commit da4645a3ae9ed7b6335e6d7297cd3f39cdc37750 +Author: Graeme Gott +Date: 2014-07-30 + + Sync translations with Transifex. + +commit aa179cb9405368ee678984b17beafd5e05ab4ccd +Author: Graeme Gott +Date: 2014-07-25 + + FIXED: Style hierarchy was not always loaded in ODT. + +commit 2cf5cbccf9717b01de7dfaa8f26bfcc5a17ed9b7 +Author: Graeme Gott +Date: 2014-07-25 + + FIXED: Ignored text sections in ODT files. + +commit cdcd7e8b60293334c409756fae54f1cda23f9d06 +Author: Graeme Gott +Date: 2014-07-25 + + FIXED: Was not reading styles for OOXML files. + commit 998667f78febfd72349a3c2538662d2b9fcebd91 Author: Graeme Gott Date: 2014-07-20 diff -Nru focuswriter-1.5.2/debian/changelog focuswriter-1.5.3/debian/changelog --- focuswriter-1.5.2/debian/changelog 2014-07-20 13:59:36.000000000 +0000 +++ focuswriter-1.5.3/debian/changelog 2014-08-17 13:11:22.000000000 +0000 @@ -1,3 +1,9 @@ +focuswriter (1.5.3-0ppa1~utopic1) utopic; urgency=low + + * New upstream release + + -- Graeme Gott Sun, 17 Aug 2014 12:59:45 +0000 + focuswriter (1.5.2-0ppa1~utopic1) utopic; urgency=low * New upstream release diff -Nru focuswriter-1.5.2/focuswriter.pro focuswriter-1.5.3/focuswriter.pro --- focuswriter-1.5.2/focuswriter.pro 2014-07-20 13:37:05.000000000 +0000 +++ focuswriter-1.5.3/focuswriter.pro 2014-08-17 12:47:53.000000000 +0000 @@ -26,7 +26,7 @@ } # Set program version -VERSION = 1.5.2 +VERSION = 1.5.3 DEFINES += VERSIONSTR=\\\"$${VERSION}\\\" # Set program name diff -Nru focuswriter-1.5.2/mac_deploy.sh focuswriter-1.5.3/mac_deploy.sh --- focuswriter-1.5.2/mac_deploy.sh 2014-07-20 13:37:09.000000000 +0000 +++ focuswriter-1.5.3/mac_deploy.sh 2014-08-17 12:47:58.000000000 +0000 @@ -2,7 +2,7 @@ APP='FocusWriter' BUNDLE="$APP.app" -VERSION='1.5.2' +VERSION='1.5.3' # Remove any previous disk folder or DMG echo -n 'Preparing... ' diff -Nru focuswriter-1.5.2/NEWS focuswriter-1.5.3/NEWS --- focuswriter-1.5.2/NEWS 2014-07-20 13:40:08.000000000 +0000 +++ focuswriter-1.5.3/NEWS 2014-08-17 12:52:37.000000000 +0000 @@ -1,3 +1,11 @@ +1.5.3 +----- +* FIXED: Find did not take smart quotes into account. +* FIXED: Style hierarchy was not always loaded in ODT +* FIXED: Ignored text sections in ODT files. +* FIXED: Was not reading styles for OOXML files. +* Translation updates: Hebrew, Portuguese (Brazil), Swedish. + 1.5.2 ----- * FIXED: Regression with RtfWriter encoding characters in Windows. diff -Nru focuswriter-1.5.2/resources/unix/focuswriter.appdata.xml focuswriter-1.5.3/resources/unix/focuswriter.appdata.xml --- focuswriter-1.5.2/resources/unix/focuswriter.appdata.xml 2014-07-20 13:24:50.000000000 +0000 +++ focuswriter-1.5.3/resources/unix/focuswriter.appdata.xml 2014-08-17 12:47:32.000000000 +0000 @@ -34,7 +34,7 @@

포커스 라이터는, 글쓰기에 집중하게 해주는 간단한 워드 프로세서입니다. 마우스를 화면 끝에 대면 작동하는 하이드-어웨이 방식을 적용해서, 프로그램이 익숙한 모양과 느낌을 유지하게 해, 잠시 방해를 받아도 금방 하던 작업에 몰두하게 합니다.

Focuswriter is een eenvoudige, afleidingsvrije tekstverwerker. Het verbergt de gebruikersinterface totdat de muis naar de rand van het scherm geschoven wordt. Het programma heeft de bekende uitstraling maar stelt daarnaast in staan om complete focus te hebben op het werk

FocusWriter é um processador de textos simples e sem distracções. A interface só aparece quando o apontador do rato se aproximar das margens do ecrã, proporcionando um aspecto familiar que ao mesmo tempo não ocupa o espaço e permite ao utilizador focar-se no seu trabalho.

FocusWriter é um simples, processador de texto simples livre de distrações. Ele Ele utiliza uma interface oculta, acessível ao mover o mouse para os cantos da interface da tela, o que dá ao programa um olhar amigável, mantendo-se discreto, assim você pode mergulhar em seu trabalho.

FocusWriter é um processador de texto simples livre de distrações. Ele utiliza uma interface oculta, acessível ao mover o mouse para os cantos da tela, o que dá ao programa um visual familiar, mas discreto. Assim você pode mergulhar em seu trabalho.

FocusWriter este un procesor de text simplu, fără distragerea atenţiei. Acesta folosește o interfaţă ascunsă pe care o accesaţi prin mutarea mouse-ului pe marginile ecranului, care permite programului să aibă un aspect şi un simţămînt familiar în timp ce se dă la o parte, astfel încît să vă puteţi cufunda în munca dvs.

FocusWriter је једноставан, слободан уређивач текста. Он користи скривени интерфејс коме се приступа померањем миша на ивице екрана, омогућавајући програму да добије познати изглед и тако вам обезбеди да се посветите вашем раду.

FocusWriter är en enkel, distraktionsfri ordbehandlare. Den utnyttjar ett dolt gränssnitt som du kommer åt genom att flytta din mus till skärmkanterna, vilket tillåter programmet att ha välbekant utseende och känsla, medan det håller sig ur vägen så att du kan fördjupa dig i ditt arbete.

@@ -50,7 +50,7 @@

포커스 라이터는 폰트와, 색상을 조절하고, 배경 그림을 추가해 테마를 만들어서 작업 환경을 직접 만들 수 있게 되어있습니다. 포커스 라이터는 때에 따라서 이용할 수 있는 통계 업데이트, 오늘의 목표, 여러 건의 문서 열기, 맞춤법 검사, 등과 그 외에 아주 많은 기능을 갖고 있습니다.

Focuswriter stelt je in staan om de applicatie aan te passen aan de wensen van lettertype, kleuren, achtergrond plaatjes om de gewenste ambiance te creëren. Het heeft direct bijgewerkte statistieken, dagelijkse doelen, meerdere open documenten, spellingscorrectie en nog veel meer.

FocusWriter permite personalizar o ambiente de trabalho com a criação de temas incluindo fonte tipográfica, cores e uma imagem de fundo. Também mostra estatísticas actualizadas em directo, objectivos diários, também abre vários documentos ao mesmo tempo, faz verificação ortográfica, e muito mais.

FocusWriter permite que você personalize o seu ambiente, criando temas que controlam a fonte, cores, e imagem de fundo para adicionar ao ambiente. Também possui rápida atualização de estatísticas, metas diárias, vários documentos abertos, verificação ortográfica e muito mais.

FocusWriter permite que você personalize o seu ambiente, criando temas que possibilitam a mudança da fonte, cores e imagem de fundo, para criar a atmosfera ideal. Também permite atualização de estatísticas, metas diárias, vários documentos abertos, verificação ortográfica e muito mais.

FocusWriter vă permite să personalizaţi mediul prin crearea de teme care controlează font-ul, culorile şi imaginea de fundal pentru a adăuga ambianţă. Acesta oferă, de asemenea, statistici de actualizare, obiective de zi cu zi, mai multe documente deschise, verificare ortografică, şi mult mai mult.

FocusWriter вам омогућава да прилагодите окружење креирањем теме са фонтом, бојама и позадинском сликом. Такође, поседује ажурирање статистике, дневне циљеве, истовремено отварање више докумената, проверу правописа и још много тога.

FocusWriter tillåter dig att anpassa din miljö genom att skapa teman som kontrollerar typsnitt, färger, och bakgrundsbilden för att lägga till atmosfär. Den har även automatisk statistikuppdatering, dagliga mål, flera öppna dokument, stavningskontroll och mycket mer.

@@ -66,7 +66,7 @@

그리고, 프로그램을 열면 작업하던 내용이 일을 멈추고 떠났던 그때 그대로 자동으로 복귀되어서 돌아오면 바로 하던 작업으로 다시 돌아갈 수 있습니다.

Daar bovenop laadt het programma je huidige onderhande werk en laat het zien op de locatie waar je gebleven bent zodat je direct verder kunt

Além do resto, o programa abre automaticamente o último trabalho em curso e coloca o cursor na sua posição em que este esteve quando a sessão anterior terminou, para assim poder voltar ao assunto sem demoras.

Além disso, quando você abrir o programa seu trabalho atual em andamento irá automaticamente carregar e posicioná-lo onde você parou de modo que você pode pular imediatamente de volta nele.

Além disso, quando você abrir o programa, seu trabalho em andamento será automaticamente carregado e posicionado onde você parou, de modo que você pode reiniciá-lo imediatamente.

În plus, atunci când deschideţi programul, lucrul dvs. în curs de execuţie va fi încărcat automat şi poziția unde aţi rămas ultima dată, astfel încît să puteţi trece imediat la treabă.

Поред тога, када отворите програм, ваш тренутни посао ће се аутоматски учитати на месту где сте последњи пут стали, тако да га можете одмах наставити.

Dessutom, när du öppnar programmet kommer ditt pågående arbete att laddas automatiskt där du slutade senast så att du omedelbart kan fortsätta

diff -Nru focuswriter-1.5.2/resources/unix/po/pt_BR.po focuswriter-1.5.3/resources/unix/po/pt_BR.po --- focuswriter-1.5.2/resources/unix/po/pt_BR.po 2014-07-20 13:31:25.000000000 +0000 +++ focuswriter-1.5.3/resources/unix/po/pt_BR.po 2014-08-17 12:47:32.000000000 +0000 @@ -4,13 +4,14 @@ # # Translators: # Lorram Lomeu de Souza Rampi , 2014 +# Márcio Massula Jr. , 2014 msgid "" msgstr "" "Project-Id-Version: FocusWriter\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-05 11:50+0000\n" -"PO-Revision-Date: 2014-07-16 22:27+0000\n" -"Last-Translator: Lorram Lomeu de Souza Rampi \n" +"PO-Revision-Date: 2014-07-21 16:57+0000\n" +"Last-Translator: Márcio Massula Jr. \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" "focuswriter/language/pt_BR/)\n" "Language: pt_BR\n" @@ -30,10 +31,10 @@ "screen, allowing the program to have a familiar look and feel to it while " "still getting out of the way so that you can immerse yourself in your work." msgstr "" -"FocusWriter é um simples, processador de texto simples livre de distrações. " -"Ele Ele utiliza uma interface oculta, acessível ao mover o mouse para os " -"cantos da interface da tela, o que dá ao programa um olhar amigável, " -"mantendo-se discreto, assim você pode mergulhar em seu trabalho." +"FocusWriter é um processador de texto simples livre de distrações. Ele " +"utiliza uma interface oculta, acessível ao mover o mouse para os cantos da " +"tela, o que dá ao programa um visual familiar, mas discreto. Assim você pode " +"mergulhar em seu trabalho." #: ../focuswriter.appdata.xml.in.h:3 msgid "" @@ -43,9 +44,9 @@ "documents, spell-checking, and much more." msgstr "" "FocusWriter permite que você personalize o seu ambiente, criando temas que " -"controlam a fonte, cores, e imagem de fundo para adicionar ao ambiente. " -"Também possui rápida atualização de estatísticas, metas diárias, vários " -"documentos abertos, verificação ortográfica e muito mais." +"possibilitam a mudança da fonte, cores e imagem de fundo, para criar a " +"atmosfera ideal. Também permite atualização de estatísticas, metas diárias, " +"vários documentos abertos, verificação ortográfica e muito mais." #: ../focuswriter.appdata.xml.in.h:4 msgid "" @@ -53,9 +54,9 @@ "automatically load and position you where you last left off so that you can " "immediately jump back in." msgstr "" -"Além disso, quando você abrir o programa seu trabalho atual em andamento irá " -"automaticamente carregar e posicioná-lo onde você parou de modo que você " -"pode pular imediatamente de volta nele." +"Além disso, quando você abrir o programa, seu trabalho em andamento será " +"automaticamente carregado e posicionado onde você parou, de modo que você " +"pode reiniciá-lo imediatamente." #: ../focuswriter.desktop.in.h:1 msgid "FocusWriter" diff -Nru focuswriter-1.5.2/resources/windows/installer.nsi focuswriter-1.5.3/resources/windows/installer.nsi --- focuswriter-1.5.2/resources/windows/installer.nsi 2014-07-20 13:37:12.000000000 +0000 +++ focuswriter-1.5.3/resources/windows/installer.nsi 2014-08-17 12:48:12.000000000 +0000 @@ -4,7 +4,7 @@ !define APPNAME "FocusWriter" !define VERSIONMAJOR 1 !define VERSIONMINOR 5 -!define VERSIONPATCH 2 +!define VERSIONPATCH 3 !define APPVERSION "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}" !define ABOUTURL "http://gottcode.org/focuswriter/" diff -Nru focuswriter-1.5.2/src/fileformats/docx_reader.cpp focuswriter-1.5.3/src/fileformats/docx_reader.cpp --- focuswriter-1.5.2/src/fileformats/docx_reader.cpp 2014-06-29 11:42:24.000000000 +0000 +++ focuswriter-1.5.3/src/fileformats/docx_reader.cpp 2014-08-17 12:47:32.000000000 +0000 @@ -123,7 +123,7 @@ // Read document defaults if (m_xml.qualifiedName() == "w:docDefaults") { while (m_xml.readNextStartElement()) { - if (m_xml.qualifiedName() == "w:rPrDefault ") { + if (m_xml.qualifiedName() == "w:rPrDefault") { if (m_xml.readNextStartElement()) { if (m_xml.qualifiedName() == "w:rPr") { readRunProperties(m_current_style); @@ -143,6 +143,7 @@ m_xml.skipCurrentElement(); } } + m_xml.skipCurrentElement(); } // Read styles @@ -177,7 +178,7 @@ } // Determine if this is the default style - if (readBool(m_xml.attributes().value("w:default"))) { + if (m_xml.attributes().hasAttribute("w:default") && readBool(m_xml.attributes().value("w:default"))) { default_style[style.type] = style_id; } @@ -192,6 +193,7 @@ style = newstyle; } style_tree[parent_style_id] += style_id; + m_xml.skipCurrentElement(); } else if ((style.type == Style::Paragraph) && (m_xml.qualifiedName() == "w:pPr")) { readParagraphProperties(style, false); } else if (m_xml.qualifiedName() == "w:rPr") { diff -Nru focuswriter-1.5.2/src/fileformats/odt_reader.cpp focuswriter-1.5.3/src/fileformats/odt_reader.cpp --- focuswriter-1.5.2/src/fileformats/odt_reader.cpp 2014-07-19 17:41:46.000000000 +0000 +++ focuswriter-1.5.3/src/fileformats/odt_reader.cpp 2014-08-17 12:47:32.000000000 +0000 @@ -131,11 +131,10 @@ QString parent_style = attributes.value(QLatin1String("style:parent-style-name")).toString(); if (!parent_style.isEmpty()) { - if (m_styles[0].contains(parent_style)) { - style = m_styles[0][parent_style]; - } else if (m_styles[1].contains(parent_style)) { - style = m_styles[1][parent_style]; - } + Style& parent = m_styles[type][parent_style]; + style.block_format = parent.block_format; + style.char_format = parent.char_format; + parent.children += name; } while (m_xml.readNextStartElement()) { @@ -147,6 +146,22 @@ m_xml.skipCurrentElement(); } } + + // Recursively apply style to children + QStringList children = style.children; + while (!children.isEmpty()) { + Style& childstyle = m_styles[type][children.takeFirst()]; + + QTextBlockFormat block_format = style.block_format; + block_format.merge(childstyle.block_format); + childstyle.block_format = block_format; + + QTextCharFormat char_format = style.char_format; + char_format.merge(childstyle.char_format); + childstyle.char_format = char_format; + + children.append(childstyle.children); + } } //----------------------------------------------------------------------------- @@ -212,23 +227,24 @@ { QXmlStreamAttributes attributes = m_xml.attributes(); - if (attributes.value(QLatin1String("fo:font-weight")) == "bold") { - format.setFontWeight(QFont::Bold); + if (attributes.hasAttribute(QLatin1String("fo:font-weight"))) { + if (attributes.value(QLatin1String("fo:font-weight")) == "bold") { + format.setFontWeight(QFont::Bold); + } else { + format.setFontWeight(QFont::Normal); + } } - if (attributes.value(QLatin1String("fo:font-style")) == "italic") { - format.setFontItalic(true); + + if (attributes.hasAttribute(QLatin1String("fo:font-style"))) { + format.setFontItalic(attributes.value(QLatin1String("fo:font-style")) != "normal"); } - if (attributes.hasAttribute(QLatin1String("style:text-underline-style")) && - attributes.value(QLatin1String("style:text-underline-style")) != "none") { - format.setFontUnderline(true); - } - if (attributes.hasAttribute((QLatin1String("style:text-underline-type"))) && - attributes.value(QLatin1String("style:text-underline-type")) != "none") { - format.setFontUnderline(true); - } - if (attributes.hasAttribute((QLatin1String("style:text-line-through-type"))) && - attributes.value(QLatin1String("style:text-line-through-type")) != "none") { - format.setFontStrikeOut(true); + + if (attributes.hasAttribute(QLatin1String("style:text-underline-style"))) { + format.setFontUnderline(attributes.value(QLatin1String("style:text-underline-style")) != "none"); + } + + if (attributes.hasAttribute(QLatin1String("style:text-line-through-type"))) { + format.setFontStrikeOut(attributes.value(QLatin1String("style:text-line-through-type")) != "none"); } if (attributes.hasAttribute(QLatin1String("style:text-position"))) { @@ -273,6 +289,8 @@ while (m_xml.readNextStartElement()) { if (m_xml.qualifiedName() == "text:p" || m_xml.qualifiedName() == "text:h") { readParagraph(); + } else if (m_xml.qualifiedName() == "text:section") { + readBodyText(); } else { m_xml.skipCurrentElement(); } diff -Nru focuswriter-1.5.2/src/fileformats/odt_reader.h focuswriter-1.5.3/src/fileformats/odt_reader.h --- focuswriter-1.5.2/src/fileformats/odt_reader.h 2014-07-19 17:41:46.000000000 +0000 +++ focuswriter-1.5.3/src/fileformats/odt_reader.h 2014-08-17 12:47:32.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2011, 2012, 2013 Graeme Gott + * Copyright (C) 2011, 2012, 2013, 2014 Graeme Gott * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -66,6 +66,7 @@ QTextBlockFormat block_format; QTextCharFormat char_format; + QStringList children; }; QHash m_styles[2]; QTextBlockFormat m_block_format; diff -Nru focuswriter-1.5.2/src/find_dialog.cpp focuswriter-1.5.3/src/find_dialog.cpp --- focuswriter-1.5.2/src/find_dialog.cpp 2014-06-29 11:42:25.000000000 +0000 +++ focuswriter-1.5.3/src/find_dialog.cpp 2014-08-17 12:47:32.000000000 +0000 @@ -20,6 +20,7 @@ #include "find_dialog.h" #include "document.h" +#include "smart_quotes.h" #include "stack.h" #include @@ -27,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -99,6 +101,21 @@ m_whole_words->setChecked(settings.value("FindDialog/WholeWords", false).toBool()); m_regular_expressions->setChecked(settings.value("FindDialog/RegularExpressions", false).toBool()); m_search_backwards->setChecked(settings.value("FindDialog/SearchBackwards", false).toBool()); + + m_find_string->installEventFilter(this); + m_replace_string->installEventFilter(this); +} + +//----------------------------------------------------------------------------- + +bool FindDialog::eventFilter(QObject* watched, QEvent* event) +{ + if ((event->type() == QEvent::KeyPress) && qobject_cast(watched)) { + if (SmartQuotes::isEnabled() && SmartQuotes::insert(static_cast(watched), static_cast(event))) { + return true; + } + } + return QDialog::eventFilter(watched, event); } //----------------------------------------------------------------------------- diff -Nru focuswriter-1.5.2/src/find_dialog.h focuswriter-1.5.3/src/find_dialog.h --- focuswriter-1.5.2/src/find_dialog.h 2014-04-05 22:34:37.000000000 +0000 +++ focuswriter-1.5.3/src/find_dialog.h 2014-08-17 12:47:32.000000000 +0000 @@ -35,6 +35,8 @@ public: FindDialog(Stack* documents); + virtual bool eventFilter(QObject* watched, QEvent* event); + public slots: void findNext(); void findPrevious(); diff -Nru focuswriter-1.5.2/src/smart_quotes.cpp focuswriter-1.5.3/src/smart_quotes.cpp --- focuswriter-1.5.2/src/smart_quotes.cpp 2014-06-29 11:42:25.000000000 +0000 +++ focuswriter-1.5.3/src/smart_quotes.cpp 2014-08-17 12:47:32.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2010, 2011, 2013 Graeme Gott + * Copyright (C) 2010, 2011, 2013, 2014 Graeme Gott * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +22,7 @@ #include "preferences.h" #include +#include #include #include #include @@ -71,6 +72,39 @@ //----------------------------------------------------------------------------- +bool SmartQuotes::insert(QLineEdit* edit, QKeyEvent* key) +{ + if (key->modifiers() & Qt::ControlModifier) { + return false; + } + + int quote = 2; + if (key->key() == Qt::Key_QuoteDbl) { + quote = 0; + } else if (key->key() != Qt::Key_Apostrophe) { + return false; + } + + int position = edit->cursorPosition() - 1; + if (position >= 0) { + QChar c = edit->text().at(position); + if (!c.isSpace() && !c.isNull() && (c.category() != QChar::Punctuation_Open)) { + quote++; + } + } + + if (key->text().right(1) != m_quotes[quote]) { + edit->del(); + edit->insert(m_quotes[quote]); + } else { + edit->insert(key->text()); + } + + return true; +} + +//----------------------------------------------------------------------------- + bool SmartQuotes::insert(QTextEdit* text, QKeyEvent* key) { if (key->modifiers() & Qt::ControlModifier) { diff -Nru focuswriter-1.5.2/src/smart_quotes.h focuswriter-1.5.3/src/smart_quotes.h --- focuswriter-1.5.2/src/smart_quotes.h 2014-06-29 11:42:25.000000000 +0000 +++ focuswriter-1.5.3/src/smart_quotes.h 2014-08-17 12:47:32.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2010, 2011, 2013 Graeme Gott + * Copyright (C) 2010, 2011, 2013, 2014 Graeme Gott * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,6 +23,7 @@ #include #include class QKeyEvent; +class QLineEdit; class QTextEdit; class SmartQuotes @@ -33,6 +34,7 @@ static size_t count(); static bool isEnabled(); + static bool insert(QLineEdit* edit, QKeyEvent* key); static bool insert(QTextEdit* text, QKeyEvent* key); static void replace(QTextEdit* text, int start, int end); static void replace(QString& string); diff -Nru focuswriter-1.5.2/translations/focuswriter_ar.ts focuswriter-1.5.3/translations/focuswriter_ar.ts --- focuswriter-1.5.2/translations/focuswriter_ar.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_ar.ts 2014-08-17 12:47:32.000000000 +0000 @@ -281,67 +281,67 @@ FindDialog - + Search for: بحث عن: - + Replace with: استبدال: - + Ignore case - + Whole words only - + Regular expressions تعبيرات قياسية - + Search up بحث تجاه فوق - + Search down بحث تجاه تحت - + &Find بحـث - + &Replace استبدال الكل - + Replace &All استبدال بالكل - + Find بحـث - + Replace استبـدال - + Replace %n instance(s)? @@ -353,19 +353,19 @@ - + Question - - + + Sorry معذرة! - - + + Phrase not found. كلمة غير موجودة. @@ -1021,12 +1021,12 @@ SmartQuote - + Replacing quotation marks... - + Please Wait من فضلك، انتظر diff -Nru focuswriter-1.5.2/translations/focuswriter_ca.ts focuswriter-1.5.3/translations/focuswriter_ca.ts --- focuswriter-1.5.2/translations/focuswriter_ca.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_ca.ts 2014-08-17 12:47:32.000000000 +0000 @@ -266,67 +266,67 @@ FindDialog - + Search for: Cerca: - + Replace with: Reemplaça amb: - + Ignore case Ignora majúscules - + Whole words only Només paraules senceres - + Regular expressions Expressions regulars - + Search up Cerca cap enrere - + Search down Cerca cap endavant - + &Find Cerca - + &Replace &Reemplaça - + Replace &All Reemplaça-ho tot - + Find Troba - + Replace Reemplaça - + Replace %n instance(s)? Esteu segur que voleu reemplaçar %n instàncies? @@ -335,19 +335,19 @@ - + Question Pregunta - - + + Sorry Disculpeu - - + + Phrase not found. No s'ha trobat la frase @@ -1003,12 +1003,12 @@ SmartQuote - + Replacing quotation marks... Reemplaça cometes ... - + Please Wait Espereu siusplau diff -Nru focuswriter-1.5.2/translations/focuswriter_cs.ts focuswriter-1.5.3/translations/focuswriter_cs.ts --- focuswriter-1.5.2/translations/focuswriter_cs.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_cs.ts 2014-08-17 12:47:32.000000000 +0000 @@ -266,67 +266,67 @@ FindDialog - + Search for: Hledat: - + Replace with: Nahradit: - + Ignore case Nevšímat si velikosti písmen - + Whole words only Pouze celá slova - + Regular expressions Regulární výrazy - + Search up Hledat nahoru - + Search down Hledat dolů - + &Find &Hledat - + &Replace &Nahradit - + Replace &All Nahradit &vše - + Find Najít - + Replace Nahradit - + Replace %n instance(s)? Nahradit jeden případ? @@ -335,19 +335,19 @@ - + Question Otázka - - + + Sorry Promiňte - - + + Phrase not found. Slovní spojení nebylo nenalezeno. @@ -1003,12 +1003,12 @@ SmartQuote - + Replacing quotation marks... Nahrazují se uvozovky... - + Please Wait Počkejte, prosím diff -Nru focuswriter-1.5.2/translations/focuswriter_da.ts focuswriter-1.5.3/translations/focuswriter_da.ts --- focuswriter-1.5.2/translations/focuswriter_da.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_da.ts 2014-08-17 12:47:32.000000000 +0000 @@ -261,67 +261,67 @@ FindDialog - + Search for: Søg efter: - + Replace with: Erstat med: - + Ignore case Ignorer store/små bogstaver - + Whole words only Kun hele ord - + Regular expressions Regulære udtryk - + Search up Søg tilbage - + Search down Søg fremad - + &Find &Find - + &Replace &Erstat - + Replace &All Erstat &alle - + Find Find - + Replace Erstat - + Replace %n instance(s)? Erstat %n forekomst? @@ -329,19 +329,19 @@ - + Question Spørgsmål - - + + Sorry Beklager - - + + Phrase not found. Frasen kunne ikke findes. @@ -997,12 +997,12 @@ SmartQuote - + Replacing quotation marks... Erstatter citatonstegn... - + Please Wait Vent venligst diff -Nru focuswriter-1.5.2/translations/focuswriter_de.ts focuswriter-1.5.3/translations/focuswriter_de.ts --- focuswriter-1.5.2/translations/focuswriter_de.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_de.ts 2014-08-17 12:47:32.000000000 +0000 @@ -261,67 +261,67 @@ FindDialog - + Search for: Suche nach: - + Replace with: Ersetze durch: - + Ignore case Groß-/Kleinschreibung ignorieren - + Whole words only Nur ganze Wörter - + Regular expressions Reguläre Ausrücke - + Search up Aufwärts suchen - + Search down Abwärts suchen - + &Find &Suchen - + &Replace &Ersetzen - + Replace &All &Alle Ersetzen - + Find Suchen - + Replace Ersetzen - + Replace %n instance(s)? In %n Fall ersetzen? @@ -329,19 +329,19 @@ - + Question Frage - - + + Sorry Entschuldigung - - + + Phrase not found. Ausdruck nicht gefunden. @@ -997,12 +997,12 @@ SmartQuote - + Replacing quotation marks... Anführungszeichen werden ersetzt... - + Please Wait Bitte warten diff -Nru focuswriter-1.5.2/translations/focuswriter_el.ts focuswriter-1.5.3/translations/focuswriter_el.ts --- focuswriter-1.5.2/translations/focuswriter_el.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_el.ts 2014-08-17 12:47:32.000000000 +0000 @@ -261,67 +261,67 @@ FindDialog - + Search for: Αναζήτηση για: - + Replace with: Αντικατάσταση με: - + Ignore case Χωρίς διάκριση πεζών/κεφαλαίων - + Whole words only Μόνο ολόκληρες λέξεις - + Regular expressions Κανονικές εκφράσεις - + Search up Αναζήτηση πάνω - + Search down Αναζήτηση κάτω - + &Find &Εύρεση - + &Replace &Αντικατάσταση - + Replace &All Αντικατάσταση &Όλων - + Find Εύρεση - + Replace Αντικατάσταση - + Replace %n instance(s)? Αντικατάσταση %n ευρήματος; @@ -329,19 +329,19 @@ - + Question Ερώτηση - - + + Sorry Λυπούμαστε - - + + Phrase not found. Δεν βρέθηκε η φράση. @@ -997,12 +997,12 @@ SmartQuote - + Replacing quotation marks... Αντικατάσταση εισαγωγικών... - + Please Wait Παρακαλώ Περιμένετε diff -Nru focuswriter-1.5.2/translations/focuswriter_en_GB.ts focuswriter-1.5.3/translations/focuswriter_en_GB.ts --- focuswriter-1.5.2/translations/focuswriter_en_GB.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_en_GB.ts 2014-08-17 12:47:32.000000000 +0000 @@ -261,67 +261,67 @@ FindDialog - + Search for: Search for: - + Replace with: Replace with: - + Ignore case Ignore case: - + Whole words only Whole words only - + Regular expressions Regular expressions - + Search up Search up - + Search down Search down - + &Find &Find - + &Replace &Replace - + Replace &All Replace &All - + Find Find - + Replace Replace - + Replace %n instance(s)? Replace %n instance? @@ -329,19 +329,19 @@ - + Question Question - - + + Sorry Sorry - - + + Phrase not found. Phrase not found. @@ -997,12 +997,12 @@ SmartQuote - + Replacing quotation marks... Replacing quotation marks... - + Please Wait Please Wait diff -Nru focuswriter-1.5.2/translations/focuswriter_en.ts focuswriter-1.5.3/translations/focuswriter_en.ts --- focuswriter-1.5.2/translations/focuswriter_en.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_en.ts 2014-08-17 12:47:32.000000000 +0000 @@ -261,67 +261,67 @@ FindDialog - + Search for: - + Replace with: - + Ignore case - + Whole words only - + Regular expressions - + Search up - + Search down - + &Find - + &Replace - + Replace &All - + Find - + Replace - + Replace %n instance(s)? Replace %n instance? @@ -329,19 +329,19 @@ - + Question - - + + Sorry - - + + Phrase not found. @@ -997,12 +997,12 @@ SmartQuote - + Replacing quotation marks... - + Please Wait diff -Nru focuswriter-1.5.2/translations/focuswriter_es_MX.ts focuswriter-1.5.3/translations/focuswriter_es_MX.ts --- focuswriter-1.5.2/translations/focuswriter_es_MX.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_es_MX.ts 2014-08-17 12:47:32.000000000 +0000 @@ -261,67 +261,67 @@ FindDialog - + Search for: Buscar: - + Replace with: Reemplazar con: - + Ignore case Ignorar mayúsculas - + Whole words only Solo palabras completas - + Regular expressions Expresiones regulares - + Search up Buscar arriba - + Search down Buscar abajo - + &Find &Buscar - + &Replace &Reemplazar - + Replace &All Reemplazar %todo - + Find Buscar - + Replace Reemplazar - + Replace %n instance(s)? Replace %n instance? @@ -329,19 +329,19 @@ - + Question Pregunta - - + + Sorry Lo siento - - + + Phrase not found. No se encontró la frase. @@ -997,12 +997,12 @@ SmartQuote - + Replacing quotation marks... Reemplazando comillas... - + Please Wait Por favor espere diff -Nru focuswriter-1.5.2/translations/focuswriter_es.ts focuswriter-1.5.3/translations/focuswriter_es.ts --- focuswriter-1.5.2/translations/focuswriter_es.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_es.ts 2014-08-17 12:47:32.000000000 +0000 @@ -261,67 +261,67 @@ FindDialog - + Search for: Buscar: - + Replace with: Reemplazar por: - + Ignore case Ignorar mayúsculas y minúsculas - + Whole words only Solo palabras completas - + Regular expressions Expresiones regulares - + Search up Hacia atrás - + Search down Hacia adelante - + &Find &Buscar - + &Replace &Reemplazar - + Replace &All Reemplazar &todas - + Find Buscar - + Replace Reemplazar - + Replace %n instance(s)? ¿Reemplazar %n coincidencia? @@ -329,19 +329,19 @@ - + Question Confirmación - - + + Sorry Aviso - - + + Phrase not found. No se encontró la frase. @@ -997,12 +997,12 @@ SmartQuote - + Replacing quotation marks... Reemplazando comillas... - + Please Wait Espere un momento diff -Nru focuswriter-1.5.2/translations/focuswriter_fi.ts focuswriter-1.5.3/translations/focuswriter_fi.ts --- focuswriter-1.5.2/translations/focuswriter_fi.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_fi.ts 2014-08-17 12:47:32.000000000 +0000 @@ -261,67 +261,67 @@ FindDialog - + Search for: Etsi: - + Replace with: Korvaa: - + Ignore case Aakkoskoolla ei ole merkitystä - + Whole words only Vain kokonaiset sanat - + Regular expressions Säännölliset lausekkeet - + Search up Etsi ylös - + Search down Etsi alas - + &Find &Etsi - + &Replace &Korvaa - + Replace &All Korvaa k&aikki - + Find Etsi - + Replace Korvaa - + Replace %n instance(s)? Korvataanko %n esiintymä? @@ -329,19 +329,19 @@ - + Question Kysymys - - + + Sorry Virhe - - + + Phrase not found. Fraasia ei löydy. @@ -997,12 +997,12 @@ SmartQuote - + Replacing quotation marks... Korvataan lainausmerkkejä… - + Please Wait Odota hetki diff -Nru focuswriter-1.5.2/translations/focuswriter_fr.ts focuswriter-1.5.3/translations/focuswriter_fr.ts --- focuswriter-1.5.2/translations/focuswriter_fr.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_fr.ts 2014-08-17 12:47:32.000000000 +0000 @@ -261,67 +261,67 @@ FindDialog - + Search for: Rechercher : - + Replace with: Remplacer par : - + Ignore case Ignorer la casse - + Whole words only Mots entiers seulement - + Regular expressions Expressions régulières - + Search up Précédent - + Search down Suivant - + &Find &Rechercher - + &Replace &Remplacer - + Replace &All Remplacer &tout - + Find Chercher - + Replace Remplacer - + Replace %n instance(s)? Remplacer %n occurrence ? @@ -329,19 +329,19 @@ - + Question Question - - + + Sorry Désolé - - + + Phrase not found. Phrase non trouvée. @@ -997,12 +997,12 @@ SmartQuote - + Replacing quotation marks... Remplacement des guillemets... - + Please Wait Veuillez patienter Binary files /tmp/wYIhFZ77XR/focuswriter-1.5.2/translations/focuswriter_he.qm and /tmp/rpzeDO2YGo/focuswriter-1.5.3/translations/focuswriter_he.qm differ diff -Nru focuswriter-1.5.2/translations/focuswriter_he.ts focuswriter-1.5.3/translations/focuswriter_he.ts --- focuswriter-1.5.2/translations/focuswriter_he.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_he.ts 2014-08-17 12:47:32.000000000 +0000 @@ -6,17 +6,17 @@ Close (%1) - לסגור (%1) + סגור (%1) Collapse - לצמצם + צמצם Expand - להרחיב + הרחיב @@ -261,67 +261,67 @@ FindDialog - + Search for: חפש עבור: - + Replace with: החלף עם: - + Ignore case התעלם מרישיות - + Whole words only כל המילים בלבד - + Regular expressions ביטויים רגולריים - + Search up חפש מעלה - + Search down חפש מטה - + &Find &מצא - + &Replace &החלף - + Replace &All החלף ה&כל - + Find מציאה - + Replace החלפה - + Replace %n instance(s)? להחליף מאורע %n? @@ -329,19 +329,19 @@ - + Question שאלה - - + + Sorry צר לי - - + + Phrase not found. צירוף מילים לא נמצא. @@ -997,12 +997,12 @@ SmartQuote - + Replacing quotation marks... מחליף כעת סימני מרכאות... - + Please Wait נא להמתין diff -Nru focuswriter-1.5.2/translations/focuswriter_hu.ts focuswriter-1.5.3/translations/focuswriter_hu.ts --- focuswriter-1.5.2/translations/focuswriter_hu.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_hu.ts 2014-08-17 12:47:32.000000000 +0000 @@ -256,86 +256,86 @@ FindDialog - + Search for: Keresés: - + Replace with: Csere: - + Ignore case Kis- és nagybetűk közötti különbség figyelmen kívül hagyása - + Whole words only Csak teljes szavakat - + Regular expressions Szabályos kifejezések - + Search up Keresés felfelé - + Search down Keresés lefelé - + &Find &Keresés... - + &Replace &Csere - + Replace &All Összes &cseréje - + Find Keresés - + Replace Csere - + Replace %n instance(s)? Kicseréljünk %n előfordulást? - + Question Kérdés - - + + Sorry Elnézést - - + + Phrase not found. A keresett kifejezés nem található. @@ -991,12 +991,12 @@ SmartQuote - + Replacing quotation marks... Idézőjelek cseréje... - + Please Wait Kérlek várj diff -Nru focuswriter-1.5.2/translations/focuswriter_hy.ts focuswriter-1.5.3/translations/focuswriter_hy.ts --- focuswriter-1.5.2/translations/focuswriter_hy.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_hy.ts 2014-08-17 12:47:32.000000000 +0000 @@ -256,86 +256,86 @@ FindDialog - + Search for: Փնտրել - + Replace with: Փոխարինել հետևյալով՝ - + Ignore case Մեծատառ թե փոքրատառ՝ կարևոր չէ։ - + Whole words only Միայն ամբողջական բառեր - + Regular expressions Կանոնավոր արտահայտություններ - + Search up Փնտրել վերևում - + Search down Փնտրել ներքևում - + &Find Գ&տնել - + &Replace &Փոխարինել - + Replace &All Փոխարինել &բոլորը - + Find Գտնել - + Replace Փոխարինել - + Replace %n instance(s)? Փոխարինե՞լ %n համընկումը։ - + Question Հարց - - + + Sorry Ներողություն։ - - + + Phrase not found. Փնտրվածը չի գտնվել։ @@ -991,12 +991,12 @@ SmartQuote - + Replacing quotation marks... Չակերտների փոփոխում... - + Please Wait Խնդրում ենք սպասել diff -Nru focuswriter-1.5.2/translations/focuswriter_id.ts focuswriter-1.5.3/translations/focuswriter_id.ts --- focuswriter-1.5.2/translations/focuswriter_id.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_id.ts 2014-08-17 12:47:32.000000000 +0000 @@ -256,86 +256,86 @@ FindDialog - + Search for: Cari: - + Replace with: Gantikan dengan: - + Ignore case Abaikan jenis huruf (kapital/kecil) - + Whole words only Hanya keseluruhan kata - + Regular expressions RegEx - + Search up Cari ke atas - + Search down Cari ke bawah - + &Find &Temukan... - + &Replace &Gantikan... - + Replace &All Gantikan &Semua - + Find Temukan - + Replace Gantikan - + Replace %n instance(s)? Gantikan %n lainnya? - + Question Pertanyaan - - + + Sorry Maaf - - + + Phrase not found. Frase tidak ditemukan. @@ -991,12 +991,12 @@ SmartQuote - + Replacing quotation marks... Mengganti tanda kutip... - + Please Wait Mohon Tunggu diff -Nru focuswriter-1.5.2/translations/focuswriter_it.ts focuswriter-1.5.3/translations/focuswriter_it.ts --- focuswriter-1.5.2/translations/focuswriter_it.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_it.ts 2014-08-17 12:47:32.000000000 +0000 @@ -261,67 +261,67 @@ FindDialog - + Search for: Cerca: - + Replace with: Sostituire con: - + Ignore case Ignora maiuscole/minuscole - + Whole words only Solo parole intere - + Regular expressions Espressioni regolari - + Search up Cerca su - + Search down Cerca giù - + &Find &Cerca - + &Replace &Sostituisci - + Replace &All Sostitusci &tutto - + Find Trova - + Replace Sostituisci - + Replace %n instance(s)? Sostituire %n istanze? @@ -329,19 +329,19 @@ - + Question Domanda - - + + Sorry Spiacente - - + + Phrase not found. Frase non trovata. @@ -997,12 +997,12 @@ SmartQuote - + Replacing quotation marks... Sostituzione virgolette ... - + Please Wait Attendere prego diff -Nru focuswriter-1.5.2/translations/focuswriter_ja.ts focuswriter-1.5.3/translations/focuswriter_ja.ts --- focuswriter-1.5.2/translations/focuswriter_ja.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_ja.ts 2014-08-17 12:47:32.000000000 +0000 @@ -256,86 +256,86 @@ FindDialog - + Search for: 検索する文字列: - + Replace with: 置換後の文字列: - + Ignore case 大文字と小文字を区別しない - + Whole words only 単語単位で探す - + Regular expressions 正規表現 - + Search up 前を検索 - + Search down 次を検索 - + &Find 検索 (&F) - + &Replace 置換 (&R) - + Replace &All すべて置換 (&A) - + Find 検索 - + Replace 置換 - + Replace %n instance(s)? %n 件置換しますか？ - + Question 確認 - - + + Sorry エラー - - + + Phrase not found. 見つかりませんでした。 @@ -991,12 +991,12 @@ SmartQuote - + Replacing quotation marks... 引用符の置換... - + Please Wait お待ちください diff -Nru focuswriter-1.5.2/translations/focuswriter_ko.ts focuswriter-1.5.3/translations/focuswriter_ko.ts --- focuswriter-1.5.2/translations/focuswriter_ko.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_ko.ts 2014-08-17 12:47:32.000000000 +0000 @@ -256,86 +256,86 @@ FindDialog - + Search for: 검색 : - + Replace with: 다음과 바꿈 : - + Ignore case 대/소문자 구분 안함 - + Whole words only 단어로 검색 - + Regular expressions 일반적인 표현 - + Search up 위로 검색 - + Search down 아래로 검색 - + &Find &찾기 - + &Replace &바꾸기 - + Replace &All &모두 바꾸기 - + Find 찾기 - + Replace 바꾸기 - + Replace %n instance(s)? %n 의 사례를 바꿀까요? - + Question 물어볼 것이 있습니다 - - + + Sorry 죄송합니다 - - + + Phrase not found. 문장이 없습니다. @@ -991,12 +991,12 @@ SmartQuote - + Replacing quotation marks... 따옴표 바꾸기... - + Please Wait 기다려 주세요 diff -Nru focuswriter-1.5.2/translations/focuswriter_nl.ts focuswriter-1.5.3/translations/focuswriter_nl.ts --- focuswriter-1.5.2/translations/focuswriter_nl.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_nl.ts 2014-08-17 12:47:32.000000000 +0000 @@ -261,67 +261,67 @@ FindDialog - + Search for: Zoeken naar: - + Replace with: Vervangen door: - + Ignore case Hoofd-/kleine letters negeren - + Whole words only Alleen hele woorden - + Regular expressions Regulieren expressies - + Search up Naar begin zoeken - + Search down Naar einde zoeken - + &Find &Zoek - + &Replace &Vervang - + Replace &All Vervang &Alles - + Find Zoeken - + Replace Vervangen - + Replace %n instance(s)? %n vondst vervangen? @@ -329,19 +329,19 @@ - + Question Vraag - - + + Sorry Sorry - - + + Phrase not found. Zoekterm niet gevonden. @@ -997,12 +997,12 @@ SmartQuote - + Replacing quotation marks... Vervang aanhalingstekens... - + Please Wait Even geduld diff -Nru focuswriter-1.5.2/translations/focuswriter_pl.ts focuswriter-1.5.3/translations/focuswriter_pl.ts --- focuswriter-1.5.2/translations/focuswriter_pl.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_pl.ts 2014-08-17 12:47:32.000000000 +0000 @@ -266,67 +266,67 @@ FindDialog - + Search for: Znajdź: - + Replace with: Zastąp: - + Ignore case Ignoruj wielkość liter - + Whole words only Tylko całe wyrazy - + Regular expressions Wyrażenia regularne - + Search up Znajdź poprzedni - + Search down Znajdź następny - + &Find &Znajdź - + &Replace &Zastąp - + Replace &All Zastąp &wszystkie - + Find Znajdź - + Replace Zastąp - + Replace %n instance(s)? Zastąpić %n wystąpienie? @@ -335,19 +335,19 @@ - + Question Pytanie - - + + Sorry Przepraszam - - + + Phrase not found. Nie znaleziono wyrażenia. @@ -1003,12 +1003,12 @@ SmartQuote - + Replacing quotation marks... Zamienianie cudzysłowów... - + Please Wait Proszę czekać Binary files /tmp/wYIhFZ77XR/focuswriter-1.5.2/translations/focuswriter_pt_BR.qm and /tmp/rpzeDO2YGo/focuswriter-1.5.3/translations/focuswriter_pt_BR.qm differ diff -Nru focuswriter-1.5.2/translations/focuswriter_pt_BR.ts focuswriter-1.5.3/translations/focuswriter_pt_BR.ts --- focuswriter-1.5.2/translations/focuswriter_pt_BR.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_pt_BR.ts 2014-08-17 12:47:32.000000000 +0000 @@ -105,7 +105,7 @@ %1 – %2 - %1 &ntraço; %2 + %1 – %2 @@ -261,67 +261,67 @@ FindDialog - + Search for: Procurar por: - + Replace with: Substituir por: - + Ignore case Ignorar capitalização - + Whole words only Somente palavras inteiras - + Regular expressions Expressões regulares - + Search up Pesquisar para trás - + Search down Pesquisar para frente - + &Find &Localizar - + &Replace &Substituir - + Replace &All Substituir &todos - + Find Localizar - + Replace Substituir - + Replace %n instance(s)? Substituir %n ocorrência? @@ -329,19 +329,19 @@ - + Question Pergunta - - + + Sorry Desculpe - - + + Phrase not found. A frase não foi encontrada. @@ -361,7 +361,7 @@ Rich Text Format - Rich Text Format + Formato Rich Text @@ -635,12 +635,12 @@ Reset daily progress for today to zero? - Redefinir o progresso diário para hoje a zero? + Redefinir o progresso diário de hoje para zero? Write byte order mark in plain text files - Escrever a ordem de bytes em arquivos de texto sem formatação + Escrever a marca de ordem de bytes (BOM) em arquivos de texto sem formatação @@ -997,12 +997,12 @@ SmartQuote - + Replacing quotation marks... Substituindo aspas... - + Please Wait Por favor, aguarde @@ -1228,7 +1228,7 @@ Indent first line - Recuar a primeira linha + Indentar a primeira linha @@ -1356,7 +1356,7 @@ Tab Width: - Largura de Retirada: + Largura da Tabulação: @@ -1379,22 +1379,22 @@ Gentle Blues - Azuis Suaves + Gentle Blues Old School - Velha Guarda + Old School Space Dreams - Sonhos Espaciais + Space Dreams Writing Desk - Escrivaninha + Writing Desk @@ -1635,7 +1635,7 @@ A simple fullscreen word processor - Um processador de textos simples para escrita em modo Tela cheia + Um processador de textos simples para escrita em modo tela cheia diff -Nru focuswriter-1.5.2/translations/focuswriter_pt.ts focuswriter-1.5.3/translations/focuswriter_pt.ts --- focuswriter-1.5.2/translations/focuswriter_pt.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_pt.ts 2014-08-17 12:47:32.000000000 +0000 @@ -261,67 +261,67 @@ FindDialog - + Search for: Procurar por : - + Replace with: Substituir por : - + Ignore case Ignorar a capitalização - + Whole words only Apenas palavras inteiras - + Regular expressions Expressões regulares - + Search up Para trás - + Search down Para frente - + &Find &Procurar - + &Replace &Substituir - + Replace &All S&ubtituir tudo - + Find Procurar - + Replace Substituir - + Replace %n instance(s)? Substituir %n ocorrência ? @@ -329,19 +329,19 @@ - + Question Pergunta - - + + Sorry Desculpe - - + + Phrase not found. A frase não foi encontrada. @@ -997,12 +997,12 @@ SmartQuote - + Replacing quotation marks... A substituir as aspas... - + Please Wait Espere por favor diff -Nru focuswriter-1.5.2/translations/focuswriter_ro.ts focuswriter-1.5.3/translations/focuswriter_ro.ts --- focuswriter-1.5.2/translations/focuswriter_ro.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_ro.ts 2014-08-17 12:47:32.000000000 +0000 @@ -266,67 +266,67 @@ FindDialog - + Search for: Caută: - + Replace with: Înlocuieşte cu: - + Ignore case Ignoră minuscule/majuscule - + Whole words only Doar cuvinte întregi - + Regular expressions Expresii regulate - + Search up Caută în sus - + Search down Caută în jos - + &Find Caută - + &Replace Înlocuieşte - + Replace &All Înlocuieşte to&ate - + Find Căutare - + Replace Înlocuire - + Replace %n instance(s)? Înlocuire %n o dată? @@ -335,19 +335,19 @@ - + Question Întrebare - - + + Sorry Scuze - - + + Phrase not found. Fraza nu a fost găsită. @@ -1003,12 +1003,12 @@ SmartQuote - + Replacing quotation marks... Înlocuire ghilimele... - + Please Wait Vă rugăm aşteptaţi diff -Nru focuswriter-1.5.2/translations/focuswriter_ru.ts focuswriter-1.5.3/translations/focuswriter_ru.ts --- focuswriter-1.5.2/translations/focuswriter_ru.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_ru.ts 2014-08-17 12:47:32.000000000 +0000 @@ -266,67 +266,67 @@ FindDialog - + Search for: Найти: - + Replace with: Заменить на: - + Ignore case Не учитывать регистр - + Whole words only Только слова целиком - + Regular expressions Регулярные выражения - + Search up Найти выше - + Search down Найти ниже - + &Find &Найти - + &Replace &Заменить - + Replace &All Заменить &все - + Find Найти - + Replace Заменить - + Replace %n instance(s)? Заменить %n совпадение? @@ -335,19 +335,19 @@ - + Question Вопрос - - + + Sorry Извините - - + + Phrase not found. Фраза не найдена. @@ -1003,12 +1003,12 @@ SmartQuote - + Replacing quotation marks... Замена кавычек... - + Please Wait Пожалуйста, подождите diff -Nru focuswriter-1.5.2/translations/focuswriter_sk.ts focuswriter-1.5.3/translations/focuswriter_sk.ts --- focuswriter-1.5.2/translations/focuswriter_sk.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_sk.ts 2014-08-17 12:47:32.000000000 +0000 @@ -266,67 +266,67 @@ FindDialog - + Search for: Vyhľadať: - + Replace with: Nahradiť: - + Ignore case Ignorovať veľkosť začiatočných písmen - + Whole words only Iba celé slová - + Regular expressions Regulárne výrazy - + Search up Hľadať smerom hore - + Search down Hľadať smerom dole - + &Find &Nájsť - + &Replace Na&hradiť - + Replace &All Nahradiť &všetko - + Find Nájsť - + Replace Nahradiť - + Replace %n instance(s)? Nahradiť %n výskyt? @@ -335,19 +335,19 @@ - + Question Otázka - - + + Sorry Prepáčte - - + + Phrase not found. Výraz nebol nájdený. @@ -1003,12 +1003,12 @@ SmartQuote - + Replacing quotation marks... Nahrádzanie úvodzoviek... - + Please Wait Čakajte prosím diff -Nru focuswriter-1.5.2/translations/focuswriter_sr.ts focuswriter-1.5.3/translations/focuswriter_sr.ts --- focuswriter-1.5.2/translations/focuswriter_sr.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_sr.ts 2014-08-17 12:47:32.000000000 +0000 @@ -266,67 +266,67 @@ FindDialog - + Search for: Претрага за: - + Replace with: Замени са: - + Ignore case Игнориши случај - + Whole words only Само целе речи - + Regular expressions Регуларни изрази - + Search up Претражи горе - + Search down Претражи доле - + &Find &Пронађи - + &Replace &Замени - + Replace &All Замени &све - + Find Пронађи - + Replace Замени - + Replace %n instance(s)? Замените %n пример? @@ -335,19 +335,19 @@ - + Question Питање - - + + Sorry Извините - - + + Phrase not found. Фраза није пронађена. @@ -1003,12 +1003,12 @@ SmartQuote - + Replacing quotation marks... Замена наводника... - + Please Wait Молимо сачекајте Binary files /tmp/wYIhFZ77XR/focuswriter-1.5.2/translations/focuswriter_sv.qm and /tmp/rpzeDO2YGo/focuswriter-1.5.3/translations/focuswriter_sv.qm differ diff -Nru focuswriter-1.5.2/translations/focuswriter_sv.ts focuswriter-1.5.3/translations/focuswriter_sv.ts --- focuswriter-1.5.2/translations/focuswriter_sv.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_sv.ts 2014-08-17 12:47:32.000000000 +0000 @@ -261,67 +261,67 @@ FindDialog - + Search for: Sök efter: - + Replace with: Ersätt med: - + Ignore case Ignorera skiftläge - + Whole words only Endast hela ord - + Regular expressions Reguljära uttryck - + Search up Sök uppåt - + Search down Sök nedåt - + &Find &Sök - + &Replace &Ersätt - + Replace &All Ersätt &alla - + Find Sök - + Replace Ersätt - + Replace %n instance(s)? Ersätt %n förekomst? @@ -329,19 +329,19 @@ - + Question Fråga - - + + Sorry Tyvärr - - + + Phrase not found. Frasen hittades inte. @@ -997,12 +997,12 @@ SmartQuote - + Replacing quotation marks... Ersätter citationstecken... - + Please Wait Vänta @@ -1203,7 +1203,7 @@ Text Background Drop Shadow - Texbakgrundsskugga + Bakgrundsskugga för text diff -Nru focuswriter-1.5.2/translations/focuswriter_tr.ts focuswriter-1.5.3/translations/focuswriter_tr.ts --- focuswriter-1.5.2/translations/focuswriter_tr.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_tr.ts 2014-08-17 12:47:32.000000000 +0000 @@ -256,86 +256,86 @@ FindDialog - + Search for: Ara: - + Replace with: Şununla değiştir: - + Ignore case Büyük/küçük harf yoksay - + Whole words only Yalnızca tam sözcükler - + Regular expressions Kurallı ifadeler - + Search up Yukarıya doğru ara - + Search down Aşağıya doğru ara - + &Find &Bul - + &Replace &Değiştir - + Replace &All &Tümünü Değiştir - + Find Bul - + Replace Değiştir - + Replace %n instance(s)? %n öğe değiştirilsin mi? - + Question Soru - - + + Sorry Üzgünüm - - + + Phrase not found. İfade bulunamadı. @@ -991,12 +991,12 @@ SmartQuote - + Replacing quotation marks... Tırnak işaretleri değiştiriliyor... - + Please Wait Lütfen Bekleyin diff -Nru focuswriter-1.5.2/translations/focuswriter_uk.ts focuswriter-1.5.3/translations/focuswriter_uk.ts --- focuswriter-1.5.2/translations/focuswriter_uk.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_uk.ts 2014-08-17 12:47:32.000000000 +0000 @@ -266,67 +266,67 @@ FindDialog - + Search for: Знайти: - + Replace with: Замінити на: - + Ignore case Ігнорувати регістр - + Whole words only Лише повні слова - + Regular expressions - + Search up Пошук уверх - + Search down Пошук вниз - + &Find - + &Replace - + Replace &All - + Find Знайти - + Replace Замінити - + Replace %n instance(s)? Замінити %n примірник? @@ -335,19 +335,19 @@ - + Question Запит - - + + Sorry На жаль - - + + Phrase not found. Фраза не знайдена. @@ -1003,12 +1003,12 @@ SmartQuote - + Replacing quotation marks... Заміна лапок... - + Please Wait Будь ласка, зачекайте diff -Nru focuswriter-1.5.2/translations/focuswriter_vi.ts focuswriter-1.5.3/translations/focuswriter_vi.ts --- focuswriter-1.5.2/translations/focuswriter_vi.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_vi.ts 2014-08-17 12:47:32.000000000 +0000 @@ -256,86 +256,86 @@ FindDialog - + Search for: Tìm kiếm cho: - + Replace with: Thay thế với: - + Ignore case Bỏ qua trường hợp chữ in hoa - + Whole words only Chỉ toàn bộ các từ này - + Regular expressions Phép toán thông thường - + Search up Tìm kiếm phía trên - + Search down Tìm kiếm phía dưới - + &Find &Tìm kiếm - + &Replace Th&ay thế - + Replace &All Tha&y thế tất cả - + Find Tìm - + Replace Thay thế - + Replace %n instance(s)? Thay thế %n tiến trình? - + Question Câu hỏi - - + + Sorry Rất tiếc - - + + Phrase not found. Không tìm thấy cụm từ. @@ -991,12 +991,12 @@ SmartQuote - + Replacing quotation marks... Thay đổi các phần đánh dấu trích dẫn.. - + Please Wait Vui lòng đợi diff -Nru focuswriter-1.5.2/translations/focuswriter_zh_CN.ts focuswriter-1.5.3/translations/focuswriter_zh_CN.ts --- focuswriter-1.5.2/translations/focuswriter_zh_CN.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_zh_CN.ts 2014-08-17 12:47:32.000000000 +0000 @@ -256,86 +256,86 @@ FindDialog - + Search for: 搜索： - + Replace with: 替换为： - + Ignore case 忽略大小写 - + Whole words only 全字匹配 - + Regular expressions 正则表达式 - + Search up 向上搜索 - + Search down 向下搜索 - + &Find 查找(&F) - + &Replace 替换(&R) - + Replace &All 替换全部(&A) - + Find 查找 - + Replace 替换 - + Replace %n instance(s)? 替换 %n 个实例？ - + Question 询问 - - + + Sorry 抱歉 - - + + Phrase not found. 没找到词组。 @@ -991,12 +991,12 @@ SmartQuote - + Replacing quotation marks... 更换引号... - + Please Wait 请等待 diff -Nru focuswriter-1.5.2/translations/focuswriter_zh_TW.ts focuswriter-1.5.3/translations/focuswriter_zh_TW.ts --- focuswriter-1.5.2/translations/focuswriter_zh_TW.ts 2014-07-20 13:36:14.000000000 +0000 +++ focuswriter-1.5.3/translations/focuswriter_zh_TW.ts 2014-08-17 12:47:32.000000000 +0000 @@ -256,86 +256,86 @@ FindDialog - + Search for: - + Replace with: - + Ignore case - + Whole words only - + Regular expressions - + Search up - + Search down - + &Find - + &Replace - + Replace &All - + Find - + Replace - + Replace %n instance(s)? - + Question - - + + Sorry - - + + Phrase not found. @@ -991,12 +991,12 @@ SmartQuote - + Replacing quotation marks... - + Please Wait diff -Nru focuswriter-1.5.2/windows_deploy.bat focuswriter-1.5.3/windows_deploy.bat --- focuswriter-1.5.2/windows_deploy.bat 2014-07-20 13:37:02.000000000 +0000 +++ focuswriter-1.5.3/windows_deploy.bat 2014-08-17 12:48:02.000000000 +0000 @@ -1,7 +1,7 @@ @ECHO OFF SET APP=FocusWriter -SET VERSION=1.5.2 +SET VERSION=1.5.3 ECHO Copying executable MKDIR %APP%