From d36c39533b444b1c28ad4c25e048b334726ad983 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Wed, 30 Dec 2015 17:13:09 +0000 Subject: [PATCH 01/14] new button texts --- assets/resources/application/ar.xml | 2 ++ assets/resources/application/be.xml | 2 ++ assets/resources/application/bg.xml | 2 ++ assets/resources/application/ca.xml | 2 ++ assets/resources/application/cs.xml | 2 ++ assets/resources/application/da.xml | 2 ++ assets/resources/application/de.xml | 2 ++ assets/resources/application/el.xml | 2 ++ assets/resources/application/en.xml | 2 ++ assets/resources/application/en_US.xml | 8 +++++--- assets/resources/application/es.xml | 2 ++ assets/resources/application/eu.xml | 2 ++ assets/resources/application/fa.xml | 2 ++ assets/resources/application/fr.xml | 2 ++ assets/resources/application/gl.xml | 2 ++ assets/resources/application/hu.xml | 2 ++ assets/resources/application/hy.xml | 2 ++ assets/resources/application/it.xml | 2 ++ assets/resources/application/ja.xml | 2 ++ assets/resources/application/ka.xml | 2 ++ assets/resources/application/ko.xml | 2 ++ assets/resources/application/nb.xml | 2 ++ assets/resources/application/nl.xml | 2 ++ assets/resources/application/pl.xml | 2 ++ assets/resources/application/pt.xml | 2 ++ assets/resources/application/ro.xml | 2 ++ assets/resources/application/ru.xml | 4 +++- assets/resources/application/sr.xml | 2 ++ assets/resources/application/th.xml | 2 ++ assets/resources/application/tr.xml | 2 ++ assets/resources/application/uk.xml | 2 ++ assets/resources/application/vi.xml | 2 ++ assets/resources/application/zh.xml | 2 ++ assets/resources/application/zh_TW.xml | 2 ++ 34 files changed, 72 insertions(+), 4 deletions(-) diff --git a/assets/resources/application/ar.xml b/assets/resources/application/ar.xml index 9a50ac149..022727ec0 100644 --- a/assets/resources/application/ar.xml +++ b/assets/resources/application/ar.xml @@ -935,6 +935,8 @@ + + diff --git a/assets/resources/application/be.xml b/assets/resources/application/be.xml index a2455c11d..8abd5749a 100644 --- a/assets/resources/application/be.xml +++ b/assets/resources/application/be.xml @@ -937,6 +937,8 @@ + + diff --git a/assets/resources/application/bg.xml b/assets/resources/application/bg.xml index 5da8c0f7b..9306ededa 100644 --- a/assets/resources/application/bg.xml +++ b/assets/resources/application/bg.xml @@ -943,6 +943,8 @@ + + diff --git a/assets/resources/application/ca.xml b/assets/resources/application/ca.xml index 6cf7a566b..74be765e4 100644 --- a/assets/resources/application/ca.xml +++ b/assets/resources/application/ca.xml @@ -943,6 +943,8 @@ + + diff --git a/assets/resources/application/cs.xml b/assets/resources/application/cs.xml index 324ea1d26..747825b0d 100644 --- a/assets/resources/application/cs.xml +++ b/assets/resources/application/cs.xml @@ -946,6 +946,8 @@ + + diff --git a/assets/resources/application/da.xml b/assets/resources/application/da.xml index eb46f6949..d272e9887 100644 --- a/assets/resources/application/da.xml +++ b/assets/resources/application/da.xml @@ -936,6 +936,8 @@ + + diff --git a/assets/resources/application/de.xml b/assets/resources/application/de.xml index 8a9f2aaca..2701928a5 100644 --- a/assets/resources/application/de.xml +++ b/assets/resources/application/de.xml @@ -942,6 +942,8 @@ + + diff --git a/assets/resources/application/el.xml b/assets/resources/application/el.xml index b068d6764..15bf16f2a 100644 --- a/assets/resources/application/el.xml +++ b/assets/resources/application/el.xml @@ -935,6 +935,8 @@ + + diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml index 164a5d643..08037ff4f 100644 --- a/assets/resources/application/en.xml +++ b/assets/resources/application/en.xml @@ -937,6 +937,8 @@ + + diff --git a/assets/resources/application/en_US.xml b/assets/resources/application/en_US.xml index 0eb73d04c..b7489cf6b 100644 --- a/assets/resources/application/en_US.xml +++ b/assets/resources/application/en_US.xml @@ -438,9 +438,9 @@ - - - + + + @@ -937,6 +937,8 @@ + + diff --git a/assets/resources/application/es.xml b/assets/resources/application/es.xml index 8c4e92baa..6edfb8cc6 100644 --- a/assets/resources/application/es.xml +++ b/assets/resources/application/es.xml @@ -943,6 +943,8 @@ + + diff --git a/assets/resources/application/eu.xml b/assets/resources/application/eu.xml index dbd99585e..103244173 100644 --- a/assets/resources/application/eu.xml +++ b/assets/resources/application/eu.xml @@ -937,6 +937,8 @@ + + diff --git a/assets/resources/application/fa.xml b/assets/resources/application/fa.xml index 43f2517b1..ae619e0be 100644 --- a/assets/resources/application/fa.xml +++ b/assets/resources/application/fa.xml @@ -936,6 +936,8 @@ + + diff --git a/assets/resources/application/fr.xml b/assets/resources/application/fr.xml index dbe402c3d..67d791766 100644 --- a/assets/resources/application/fr.xml +++ b/assets/resources/application/fr.xml @@ -930,6 +930,8 @@ + + diff --git a/assets/resources/application/gl.xml b/assets/resources/application/gl.xml index 4d408bb15..0107cec27 100644 --- a/assets/resources/application/gl.xml +++ b/assets/resources/application/gl.xml @@ -927,6 +927,8 @@ + + diff --git a/assets/resources/application/hu.xml b/assets/resources/application/hu.xml index 56b5757ba..d70e324fe 100644 --- a/assets/resources/application/hu.xml +++ b/assets/resources/application/hu.xml @@ -927,6 +927,8 @@ + + diff --git a/assets/resources/application/hy.xml b/assets/resources/application/hy.xml index 40d6d5046..2f607c14c 100644 --- a/assets/resources/application/hy.xml +++ b/assets/resources/application/hy.xml @@ -943,6 +943,8 @@ + + diff --git a/assets/resources/application/it.xml b/assets/resources/application/it.xml index 1f16af5e9..95698e31d 100644 --- a/assets/resources/application/it.xml +++ b/assets/resources/application/it.xml @@ -929,6 +929,8 @@ + + diff --git a/assets/resources/application/ja.xml b/assets/resources/application/ja.xml index 34b9fb37b..1d143bfb4 100644 --- a/assets/resources/application/ja.xml +++ b/assets/resources/application/ja.xml @@ -937,6 +937,8 @@ + + diff --git a/assets/resources/application/ka.xml b/assets/resources/application/ka.xml index 92d2a3028..644a8eb7a 100644 --- a/assets/resources/application/ka.xml +++ b/assets/resources/application/ka.xml @@ -942,6 +942,8 @@ + + diff --git a/assets/resources/application/ko.xml b/assets/resources/application/ko.xml index d8eac393a..3218ae90d 100644 --- a/assets/resources/application/ko.xml +++ b/assets/resources/application/ko.xml @@ -937,6 +937,8 @@ + + diff --git a/assets/resources/application/nb.xml b/assets/resources/application/nb.xml index bfd74627c..ea13e6608 100644 --- a/assets/resources/application/nb.xml +++ b/assets/resources/application/nb.xml @@ -937,6 +937,8 @@ + + diff --git a/assets/resources/application/nl.xml b/assets/resources/application/nl.xml index 42929915b..e4a529f80 100644 --- a/assets/resources/application/nl.xml +++ b/assets/resources/application/nl.xml @@ -937,6 +937,8 @@ + + diff --git a/assets/resources/application/pl.xml b/assets/resources/application/pl.xml index 228e29c96..f44e04631 100644 --- a/assets/resources/application/pl.xml +++ b/assets/resources/application/pl.xml @@ -927,6 +927,8 @@ + + diff --git a/assets/resources/application/pt.xml b/assets/resources/application/pt.xml index aefabda02..bf1ce3a49 100755 --- a/assets/resources/application/pt.xml +++ b/assets/resources/application/pt.xml @@ -941,6 +941,8 @@ + + diff --git a/assets/resources/application/ro.xml b/assets/resources/application/ro.xml index f4f6723b3..f197bc0c2 100644 --- a/assets/resources/application/ro.xml +++ b/assets/resources/application/ro.xml @@ -930,6 +930,8 @@ + + diff --git a/assets/resources/application/ru.xml b/assets/resources/application/ru.xml index 727f7cf3a..eb2fb28b5 100644 --- a/assets/resources/application/ru.xml +++ b/assets/resources/application/ru.xml @@ -443,7 +443,7 @@ - + @@ -942,6 +942,8 @@ + + diff --git a/assets/resources/application/sr.xml b/assets/resources/application/sr.xml index 5f072b209..f499c32c4 100644 --- a/assets/resources/application/sr.xml +++ b/assets/resources/application/sr.xml @@ -937,6 +937,8 @@ + + diff --git a/assets/resources/application/th.xml b/assets/resources/application/th.xml index 04e31e2fe..f7b483f05 100644 --- a/assets/resources/application/th.xml +++ b/assets/resources/application/th.xml @@ -927,6 +927,8 @@ + + diff --git a/assets/resources/application/tr.xml b/assets/resources/application/tr.xml index 6a904cc07..5760a1970 100644 --- a/assets/resources/application/tr.xml +++ b/assets/resources/application/tr.xml @@ -937,6 +937,8 @@ + + diff --git a/assets/resources/application/uk.xml b/assets/resources/application/uk.xml index 3b8708518..67d86d564 100644 --- a/assets/resources/application/uk.xml +++ b/assets/resources/application/uk.xml @@ -927,6 +927,8 @@ + + diff --git a/assets/resources/application/vi.xml b/assets/resources/application/vi.xml index b6299a2e0..c6213ff2c 100644 --- a/assets/resources/application/vi.xml +++ b/assets/resources/application/vi.xml @@ -928,6 +928,8 @@ + + diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml index 2e5afd228..daf289aa7 100644 --- a/assets/resources/application/zh.xml +++ b/assets/resources/application/zh.xml @@ -927,6 +927,8 @@ + + diff --git a/assets/resources/application/zh_TW.xml b/assets/resources/application/zh_TW.xml index 3e1b26fba..f0fed945d 100644 --- a/assets/resources/application/zh_TW.xml +++ b/assets/resources/application/zh_TW.xml @@ -927,6 +927,8 @@ + + From b14565bea05362291039cea430a9c20a88c048f4 Mon Sep 17 00:00:00 2001 From: Trottel Date: Thu, 31 Dec 2015 09:31:09 +0100 Subject: [PATCH 02/14] Update cs.xml Updated and fixed some items. --- assets/resources/application/cs.xml | 110 ++++++++++++++-------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/assets/resources/application/cs.xml b/assets/resources/application/cs.xml index 324ea1d26..8e2ea7e4c 100644 --- a/assets/resources/application/cs.xml +++ b/assets/resources/application/cs.xml @@ -57,7 +57,7 @@ - + @@ -195,7 +195,7 @@ - + @@ -282,7 +282,7 @@ - + @@ -298,10 +298,10 @@ - - - - + + + + @@ -351,7 +351,7 @@ - + @@ -372,7 +372,7 @@ - + @@ -447,9 +447,9 @@ - - - + + + @@ -725,12 +725,12 @@ - - - - - - + + + + + + @@ -835,26 +835,26 @@ - - - - + + + + - - - + + + - - - - - - - - + + + + + + + + - + @@ -875,12 +875,12 @@ - + - + @@ -1078,26 +1078,26 @@ - + - + - + - + - + - + - + - + @@ -1115,13 +1115,13 @@ - + - + - + @@ -1232,22 +1232,22 @@ - - - + + + - + - + - - + + - + From 6b65ebda5bd482a2bd90e0e73c009914cb91fdcf Mon Sep 17 00:00:00 2001 From: Aplicatii Romanesti Date: Mon, 11 Jan 2016 21:35:30 +0200 Subject: [PATCH 03/14] translation of: English US Engleza US --- assets/resources/zlibrary/ro.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/resources/zlibrary/ro.xml b/assets/resources/zlibrary/ro.xml index be9bacb17..d5453e7cf 100644 --- a/assets/resources/zlibrary/ro.xml +++ b/assets/resources/zlibrary/ro.xml @@ -1,6 +1,8 @@ + + @@ -43,7 +45,7 @@ - + From 107a5f679de1ed7024421a91a528ec8d60807aa1 Mon Sep 17 00:00:00 2001 From: Aplicatii Romanesti Date: Mon, 11 Jan 2016 22:09:09 +0200 Subject: [PATCH 04/14] Translation of new menius --- assets/resources/application/ro.xml | 112 ++++++++++++++-------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/assets/resources/application/ro.xml b/assets/resources/application/ro.xml index f4f6723b3..daabfb820 100644 --- a/assets/resources/application/ro.xml +++ b/assets/resources/application/ro.xml @@ -60,7 +60,7 @@ - + @@ -254,7 +254,7 @@ - + @@ -266,7 +266,7 @@ - + @@ -282,10 +282,10 @@ - - - - + + @@ -293,7 +293,7 @@ - + @@ -319,7 +319,7 @@ - + @@ -335,7 +335,7 @@ - + @@ -356,7 +356,7 @@ - + @@ -431,9 +431,9 @@ - - - + + + @@ -619,7 +619,7 @@ - + @@ -627,7 +627,7 @@ - + @@ -709,12 +709,12 @@ - - - - - - + + + + + + @@ -775,11 +775,11 @@ - - - - - + + + + + @@ -818,15 +818,15 @@ - - - - - + + + + - - - + + + @@ -1070,16 +1070,16 @@ - + - + - + - + @@ -1099,13 +1099,13 @@ - + - + - + @@ -1216,35 +1216,35 @@ - - - + + + - - + + - - + - + - - + + - - - - + + + + From 38d6bb170f3867924dc4b91639f165dc31552cdf Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Wed, 13 Jan 2016 03:27:54 +0000 Subject: [PATCH 05/14] fixed xml --- assets/resources/application/ro.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/assets/resources/application/ro.xml b/assets/resources/application/ro.xml index 3bdc2748d..2389843d1 100644 --- a/assets/resources/application/ro.xml +++ b/assets/resources/application/ro.xml @@ -283,8 +283,8 @@ - + @@ -779,7 +779,7 @@ - @@ -818,7 +818,7 @@ - @@ -1081,7 +1081,7 @@ - @@ -1226,9 +1226,9 @@ - + - From ab632aa8b5bd246bdea6425de9a7ddc1025a4e97 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sun, 24 Jan 2016 14:15:40 +0000 Subject: [PATCH 06/14] understand both • and • in (x)htmls; use • in own htmls --- assets/data/premium/be.html | 8 +++--- assets/data/premium/cs.html | 8 +++--- assets/data/premium/de.html | 8 +++--- assets/data/premium/en.html | 8 +++--- assets/data/premium/en_US.html | 8 +++--- assets/data/premium/es.html | 8 +++--- assets/data/premium/nl.html | 8 +++--- assets/data/premium/pt.html | 8 +++--- assets/data/premium/ru.html | 8 +++--- assets/data/whatsnew/en.html | 28 +++++++++---------- assets/data/whatsnew/ru.html | 28 +++++++++---------- assets/formats/html/html.ent | 1 + assets/formats/xhtml/xhtml-merged.ent | 1 + .../fbreader/src/formats/rtf/RtfReader.cpp | 2 +- 14 files changed, 67 insertions(+), 65 deletions(-) diff --git a/assets/data/premium/be.html b/assets/data/premium/be.html index f491f4477..7bf763cb2 100755 --- a/assets/data/premium/be.html +++ b/assets/data/premium/be.html @@ -1,7 +1,7 @@

Падабаецца FBReader? Жадаеце больш магчымасьцяў? Чаму б не абнавіцца да прэміюмнага выданьня FBReader?

Прычыны для куплі: -
• Убудаваня падтрымка PDF і коміксаў (CBR, CBZ). -
• Бібліятэка ў выглядзе мініятур. 100% без рэклямы. (вы можаце выбраць старыя выгляд бібліятэкі, калі захочаце). -
• Інтэграцыя Google Translate: проста вылучайце фразу і націскайец кнопку перакладу ў выплыўным мэню. -
• Вашая купля дапаможа разьвіцьцю праекту FBReader, дазваляючы нараджацца новым магчымасьцям для бясплатнай і прэміюмнай вэрсій праграмы.

+
• Убудаваня падтрымка PDF і коміксаў (CBR, CBZ). +
• Бібліятэка ў выглядзе мініятур. 100% без рэклямы. (вы можаце выбраць старыя выгляд бібліятэкі, калі захочаце). +
• Інтэграцыя Google Translate: проста вылучайце фразу і націскайец кнопку перакладу ў выплыўным мэню. +
• Вашая купля дапаможа разьвіцьцю праекту FBReader, дазваляючы нараджацца новым магчымасьцям для бясплатнай і прэміюмнай вэрсій праграмы.

Аднойчы абнавіўшыся ад FBReader Прэміюм, Вы зможаце выкарыстоўваць усе яго магчымасьці на ўсіх сваіх прыладах. Усе Вашыя налады будуць аўтаматычна скапіяваныя ў прэміюмную вэрсію.

diff --git a/assets/data/premium/cs.html b/assets/data/premium/cs.html index eff40007d..cf853a573 100644 --- a/assets/data/premium/cs.html +++ b/assets/data/premium/cs.html @@ -1,7 +1,7 @@

Máte rádi FBReader? Chcete mít přístup k více funkcím? Proč neupgradovat na prémiovou edici FBReaderu?

Důvody k zakoupení: -
• Integrace Překladače Google: stačí vybrat frázi a zvolit ikonu překladu z překryvné nabídky. -
• Vestavěná podpora pro formáty PDF a komiksy (CBR, CBZ). -
• Zobrazení knihovny Miniatury. Stoprocentně bez reklam. (Můžete se vrátit ke klasickému zobrazení knihovny, pokud mu dáváte přednost.) -
• Váš nákup podpoří projekt FBReaderu a umožní přidávání více a více nových funkcí do bezplatné i prémiové verze aplikace.

+
• Integrace Překladače Google: stačí vybrat frázi a zvolit ikonu překladu z překryvné nabídky. +
• Vestavěná podpora pro formáty PDF a komiksy (CBR, CBZ). +
• Zobrazení knihovny Miniatury. Stoprocentně bez reklam. (Můžete se vrátit ke klasickému zobrazení knihovny, pokud mu dáváte přednost.) +
• Váš nákup podpoří projekt FBReaderu a umožní přidávání více a více nových funkcí do bezplatné i prémiové verze aplikace.

Jakmile upgradujete na FBReader Premium, můžete si užívat jeho funkce na všech svých zařízeních. Všechna vaše nastavení budou automaticky přenesena do prémiové verze.

diff --git a/assets/data/premium/de.html b/assets/data/premium/de.html index 26cff534b..6d506c956 100644 --- a/assets/data/premium/de.html +++ b/assets/data/premium/de.html @@ -1,7 +1,7 @@

Gefällt ihnen FBReader? Wollen sie mehr Funktionen? Warum nicht auf FBReader Premium Edtion upgraden?

Gründe für den Kauf: -
• Integration von Google Translate: eine Satz auswählen und das Übersetzungsicon im Popup auswählen. -
• Eingebaute Unterstützung für PDF und Comic (CBR, CBZ). -
• Moderne (Material Design) Bibliotheksansicht. 100% frei von Werbung. (Wenn gewünscht, können sie zurück zur klassischen Ansicht wechseln.) -
• Ihr Kauf unterstützt das FBReader Projekt. Es können mehr neue Funktionen zur freien und zur Premium Edition hinzugefügt werden.

+
• Integration von Google Translate: eine Satz auswählen und das Übersetzungsicon im Popup auswählen. +
• Eingebaute Unterstützung für PDF und Comic (CBR, CBZ). +
• Moderne (Material Design) Bibliotheksansicht. 100% frei von Werbung. (Wenn gewünscht, können sie zurück zur klassischen Ansicht wechseln.) +
• Ihr Kauf unterstützt das FBReader Projekt. Es können mehr neue Funktionen zur freien und zur Premium Edition hinzugefügt werden.

Nach dem einmaligen Upgrade können sie alle Funktionen auf all ihren Geräten genießen. Alle Einstellungen werden automatisch in die Premium Edition übernommen.

diff --git a/assets/data/premium/en.html b/assets/data/premium/en.html index a792a3ce0..49f20d414 100644 --- a/assets/data/premium/en.html +++ b/assets/data/premium/en.html @@ -1,7 +1,7 @@

Do you like FBReader? Want to access more features? Why not upgrade to FBReader Premium Edtion?

Reasons to buy: -
• Google Translate integration: just select a phrase and choose the translation icon from the popup menu. -
• Built-in support for PDF and comic book formats (CBR, CBZ). -
• Thumbnail library view. 100% ad-free. (You can revert to classic library view if you prefer.) -
• Your purchase supports the FBReader project, allowing more and more new features to be added to both the Free and Premium versions of the app.

+
• Google Translate integration: just select a phrase and choose the translation icon from the popup menu. +
• Built-in support for PDF and comic book formats (CBR, CBZ). +
• Thumbnail library view. 100% ad-free. (You can revert to classic library view if you prefer.) +
• Your purchase supports the FBReader project, allowing more and more new features to be added to both the Free and Premium versions of the app.

After upgrading to FBReader Premium once, you can enjoy its features on all your devices. All your settings will be transferred to the Premium version automatically.

diff --git a/assets/data/premium/en_US.html b/assets/data/premium/en_US.html index 357fa895d..ca3b0f2fc 100644 --- a/assets/data/premium/en_US.html +++ b/assets/data/premium/en_US.html @@ -1,7 +1,7 @@

Do you like FBReader? Want to access more features? Why not upgrade to FBReader Premium Edtion?

Reasons to buy: -
• Built-in support for PDF and comic book formats (CBR, CBZ). -
• Thumbnail library view. 100% ad-free. (You can revert to classic library view if you prefer.) -
• Google Translate integration: just select a phrase and choose the translation icon from the popup menu. -
• Your purchase supports the FBReader project, allowing more and more new features to be added to both the Free and Premium versions of the app.

+
• Built-in support for PDF and comic book formats (CBR, CBZ). +
• Thumbnail library view. 100% ad-free. (You can revert to classic library view if you prefer.) +
• Google Translate integration: just select a phrase and choose the translation icon from the popup menu. +
• Your purchase supports the FBReader project, allowing more and more new features to be added to both the Free and Premium versions of the app.

After upgrading to FBReader Premium once, you can enjoy its features on all your devices. All your settings will be transferred to the Premium version automatically.

diff --git a/assets/data/premium/es.html b/assets/data/premium/es.html index 05ac72abc..d202b6cf1 100644 --- a/assets/data/premium/es.html +++ b/assets/data/premium/es.html @@ -1,7 +1,7 @@

¿Le gusta FBReader? ¿Quiere disfrutar de más y mejores características? ¡Debería actualizar a FBReader Premium Edition!

Razones para comprar: -
• Integración con Google Translate: simplemente seleccione una frase y pulse el icono de traducción en el menú que aparecerá en pantalla. -
• Soporte integrado para PDF y formatos de cómic (CBR, CBZ). -
• Vista de biblioteca en miniaturas. 100% libre de anuncios. (Puede seguir usando la vista clásica si lo prefiere.) -
• Con su compra estará colaborando con el proyecto FBReader, permitiendo que sigamos añadiendo características y mejoras a la aplicación, tanto en la versión gratuita como en la Premium.

+
• Integración con Google Translate: simplemente seleccione una frase y pulse el icono de traducción en el menú que aparecerá en pantalla. +
• Soporte integrado para PDF y formatos de cómic (CBR, CBZ). +
• Vista de biblioteca en miniaturas. 100% libre de anuncios. (Puede seguir usando la vista clásica si lo prefiere.) +
• Con su compra estará colaborando con el proyecto FBReader, permitiendo que sigamos añadiendo características y mejoras a la aplicación, tanto en la versión gratuita como en la Premium.

Sólo tiene que completar la actualización a FBReader Premium una vez; después podrá disfrutar de las ventajas Premium en todos sus dispositivos. Y todos sus ajustes se transferirán a la versión Premium automáticamente.

diff --git a/assets/data/premium/nl.html b/assets/data/premium/nl.html index fce9c4c57..909fa3d94 100644 --- a/assets/data/premium/nl.html +++ b/assets/data/premium/nl.html @@ -1,7 +1,7 @@

Vind je FBReader leuk? Wil je gebruik maken van meer mogelijkheden? Waarom upgrade je niet naar FBReader Premium Edition?

Redenen om deze te kopen: -
• Google Translate integratie: selecteer een zin en kies het vertaalpictogram uit het popupmenu. -
• Ingebouwde ondersteuning voor PDF en comic book formaten (CBR, CBZ). -
• Moderne (material design) bibliotheek zonder advertenties. (Je kunt altijd terug naar de klassieke bibliotheek als je dat wilt.) -
• Met jouw aankoop ondersteun je het FBReader-project. Hierdoor kunnen steeds nieuwe mogelijkheden toegevoegd worden aan de gratis en aan de Premium-versie.

+
• Google Translate integratie: selecteer een zin en kies het vertaalpictogram uit het popupmenu. +
• Ingebouwde ondersteuning voor PDF en comic book formaten (CBR, CBZ). +
• Moderne (material design) bibliotheek zonder advertenties. (Je kunt altijd terug naar de klassieke bibliotheek als je dat wilt.) +
• Met jouw aankoop ondersteun je het FBReader-project. Hierdoor kunnen steeds nieuwe mogelijkheden toegevoegd worden aan de gratis en aan de Premium-versie.

Na de eenmalige upgrade kun je alle functionaliteit gebruiken op al jouw apparaten. Alle instellingen worden automatisch overgenomen naar de Premium-versie.

diff --git a/assets/data/premium/pt.html b/assets/data/premium/pt.html index 063e9d95b..04db14e55 100644 --- a/assets/data/premium/pt.html +++ b/assets/data/premium/pt.html @@ -1,7 +1,7 @@

Gosta do FBReader? Deseja ter acesso a mais funcionalidades? Porque não atualizar para o FBReader - Edição Premium?

Razões para comprar: -
• Integração Google Tradutor: escolha uma frase a traduzir e clique no ícone de tradução do menu popup. -
• Compatibilidade para PDF e formatos de banda desenhada (CBR, CBZ) incorporada. -
• Vista de biblioteca em miniatura. 100% livre de anúncios. (Pode reverter para a vista de biblioteca clássica se preferir.) -
• Com a sua compra está a ajudar o projeto FBReader, permitindo que mais e mais funcionalidades sejam adicionadas à versão gratuita e premium da app.

+
• Integração Google Tradutor: escolha uma frase a traduzir e clique no ícone de tradução do menu popup. +
• Compatibilidade para PDF e formatos de banda desenhada (CBR, CBZ) incorporada. +
• Vista de biblioteca em miniatura. 100% livre de anúncios. (Pode reverter para a vista de biblioteca clássica se preferir.) +
• Com a sua compra está a ajudar o projeto FBReader, permitindo que mais e mais funcionalidades sejam adicionadas à versão gratuita e premium da app.

Assim que comprar a versão Premium do FBReader, poderá usar todas as funcionalidades em todos os seus dispositivos. Todas as definições serão automaticamente transferidas para a versão Premium.

diff --git a/assets/data/premium/ru.html b/assets/data/premium/ru.html index 9d9d74416..047c4e961 100644 --- a/assets/data/premium/ru.html +++ b/assets/data/premium/ru.html @@ -1,7 +1,7 @@

Вам нравится FBReader? Вы хотите пользоваться дополнительными возможностями? Купите FBReader Premium!

Причины купить FBReader Premium: -
• Встроенная работа с переводчиками Яндекс и Гугл: достаточно просто выделить фразу и нажать на иконку перевода. -
• Встроенная поддержка PDF и комиксов (CBR, CBZ). -
• Книжная полка, без рекламы. (Впрочем, можно использовать и «классическую» библиотеку.) -
• Покупая, вы поддерживаете проект FBReader, даёте нам возможность развивать дальше и свободное, и платное приложения.

+
• Встроенная работа с переводчиками Яндекс и Гугл: достаточно просто выделить фразу и нажать на иконку перевода. +
• Встроенная поддержка PDF и комиксов (CBR, CBZ). +
• Книжная полка, без рекламы. (Впрочем, можно использовать и «классическую» библиотеку.) +
• Покупая, вы поддерживаете проект FBReader, даёте нам возможность развивать дальше и свободное, и платное приложения.

Купив FBReader Premium, вы сможете установить его на всех своих устройствах. Ваши настройки будут автоматически скопированы из свободной версии.

diff --git a/assets/data/whatsnew/en.html b/assets/data/whatsnew/en.html index 707c5d78b..0f64730f7 100644 --- a/assets/data/whatsnew/en.html +++ b/assets/data/whatsnew/en.html @@ -1,15 +1,15 @@

Version 2.6 (Nov XX, 2015)

-

• Added this dialog :)

-

• Material design UI style

-

• In reading mode there are two menus now, left (“book”) and right (“main”). Item positions are configurable

-

• Custom shelves synchronisation

-

• Book metainfo synchronisation

-

• Marlin encrypted ePubs support

-

• Fixed tags/authors editing in the book info dialog

-

• Better access to file system on Android 5+ devices

-

• Tags view in the bookshelf

-

• Optional alphabetical grouping of books in the bookshelf

-

• Fast scroll and alphabetic index in the bookshelf (swipe finger along the right edge of the list)

-

• Page numbers in the table of contents

-

• Simple start screen widgets

-

• Minor fixes

+

• Added this dialog :)

+

• Material design UI style

+

• In reading mode there are two menus now, left (“book”) and right (“main”). Item positions are configurable

+

• Custom shelves synchronisation

+

• Book metainfo synchronisation

+

• Marlin encrypted ePubs support

+

• Fixed tags/authors editing in the book info dialog

+

• Better access to file system on Android 5+ devices

+

• Tags view in the bookshelf

+

• Optional alphabetical grouping of books in the bookshelf

+

• Fast scroll and alphabetic index in the bookshelf (swipe finger along the right edge of the list)

+

• Page numbers in the table of contents

+

• Simple start screen widgets

+

• Minor fixes

diff --git a/assets/data/whatsnew/ru.html b/assets/data/whatsnew/ru.html index e96e68588..82d778be6 100644 --- a/assets/data/whatsnew/ru.html +++ b/assets/data/whatsnew/ru.html @@ -1,15 +1,15 @@

Версия 2.6 (XX ноября 2015)

-

• Появился этот диалог :)

-

• Новый внешний вид программы, в стиле Material Design

-

• В режиме чтения появилось дополнительное меню слева. Можно настроить, какие пункты в каком меню показывать

-

• Синхронизация добавленных пользователем полок

-

• Синхронизация информации о книге

-

• Поддержка файлов ePub, зашифрованных алгоритмом Marlin

-

• Работает редактирование списков авторов и категорий книги

-

• Улучшен доступ к файловой системе на устройствах с андроид 5.0 и выше

-

• Просмотр книг по категориям в книжной полке

-

• Возможность группировать книги по алфавиту в книжной полке

-

• В книжной полке появилась быстрая прокрутка с алфавитным индексом (нужно провести пальцем вдоль правого края списка)

-

• В оглавлении появились номера страниц

-

• Появились простые виджеты для добавления на стартовый экран

-

• Мелкие исправления

+

• Появился этот диалог :)

+

• Новый внешний вид программы, в стиле Material Design

+

• В режиме чтения появилось дополнительное меню слева. Можно настроить, какие пункты в каком меню показывать

+

• Синхронизация добавленных пользователем полок

+

• Синхронизация информации о книге

+

• Поддержка файлов ePub, зашифрованных алгоритмом Marlin

+

• Работает редактирование списков авторов и категорий книги

+

• Улучшен доступ к файловой системе на устройствах с андроид 5.0 и выше

+

• Просмотр книг по категориям в книжной полке

+

• Возможность группировать книги по алфавиту в книжной полке

+

• В книжной полке появилась быстрая прокрутка с алфавитным индексом (нужно провести пальцем вдоль правого края списка)

+

• В оглавлении появились номера страниц

+

• Появились простые виджеты для добавления на стартовый экран

+

• Мелкие исправления

diff --git a/assets/formats/html/html.ent b/assets/formats/html/html.ent index e9f86553b..8b462e75a 100644 --- a/assets/formats/html/html.ent +++ b/assets/formats/html/html.ent @@ -180,6 +180,7 @@ + diff --git a/assets/formats/xhtml/xhtml-merged.ent b/assets/formats/xhtml/xhtml-merged.ent index 563f32491..b5e8e735c 100644 --- a/assets/formats/xhtml/xhtml-merged.ent +++ b/assets/formats/xhtml/xhtml-merged.ent @@ -176,6 +176,7 @@ + diff --git a/jni/NativeFormats/fbreader/src/formats/rtf/RtfReader.cpp b/jni/NativeFormats/fbreader/src/formats/rtf/RtfReader.cpp index 948f2eb6a..ad1162cd2 100644 --- a/jni/NativeFormats/fbreader/src/formats/rtf/RtfReader.cpp +++ b/jni/NativeFormats/fbreader/src/formats/rtf/RtfReader.cpp @@ -181,7 +181,7 @@ void RtfReader::fillKeywordMap() { addAction("\\", new RtfCharCommand("\\")); addAction("{", new RtfCharCommand("{")); addAction("}", new RtfCharCommand("}")); - addAction("bullet", new RtfCharCommand("\xE2\x80\xA2")); // • + addAction("bullet", new RtfCharCommand("\xE2\x80\xA2")); // • addAction("endash", new RtfCharCommand("\xE2\x80\x93")); // – addAction("emdash", new RtfCharCommand("\xE2\x80\x94")); // — addAction("~", new RtfCharCommand("\xC0\xA0")); //   From f87eb331538905d9552d33439a8b87ef9894b26d Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Fri, 29 Jan 2016 22:30:16 +0000 Subject: [PATCH 07/14] typo in Italian --- assets/resources/application/it.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/resources/application/it.xml b/assets/resources/application/it.xml index 95698e31d..5f64c8635 100644 --- a/assets/resources/application/it.xml +++ b/assets/resources/application/it.xml @@ -322,7 +322,7 @@ - + From 8804eedbd575252706b1f7d5d2a9ff138d4fa779 Mon Sep 17 00:00:00 2001 From: Shelley Shyan Date: Sun, 31 Jan 2016 00:02:34 +0800 Subject: [PATCH 08/14] Update zh.xml Translated untranslated. --- assets/resources/zlibrary/zh.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/resources/zlibrary/zh.xml b/assets/resources/zlibrary/zh.xml index 0402679ce..dbc0ea02c 100644 --- a/assets/resources/zlibrary/zh.xml +++ b/assets/resources/zlibrary/zh.xml @@ -23,7 +23,7 @@ - + @@ -55,9 +55,9 @@ - + - + From 759287e73e190049e5f30f453f701496f85e2873 Mon Sep 17 00:00:00 2001 From: Shelley Shyan Date: Sun, 31 Jan 2016 00:45:49 +0800 Subject: [PATCH 09/14] Update zh.xml Half done. --- assets/resources/application/zh.xml | 214 ++++++++++++++-------------- 1 file changed, 107 insertions(+), 107 deletions(-) diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml index daf289aa7..1527a6798 100644 --- a/assets/resources/application/zh.xml +++ b/assets/resources/application/zh.xml @@ -4,7 +4,7 @@ - + @@ -18,36 +18,36 @@ - + - - + + - - - - - - - - + + + + + + + + - - - - + + + + - - + + - - + + - - + + @@ -57,7 +57,7 @@ - + @@ -71,16 +71,16 @@ - + - - - + + + - - + + @@ -126,8 +126,8 @@ - - + + @@ -242,16 +242,16 @@ - - - + + + - + - - + + @@ -263,7 +263,7 @@ - + @@ -279,20 +279,20 @@ - + - - + + - - - + + + @@ -316,11 +316,11 @@ - + - + @@ -362,17 +362,17 @@ - + - + - + - - + + @@ -402,9 +402,9 @@ - - - + + + @@ -478,9 +478,9 @@ - - - + + + @@ -508,14 +508,14 @@ - + - - + + @@ -628,9 +628,9 @@ - - - + + + @@ -640,30 +640,30 @@ - - - + + + - - - + + + - - + + - + - + @@ -673,12 +673,12 @@ - + - - - - + + + + @@ -695,23 +695,23 @@ - + - - - - + + + + - - - - - + + + + + @@ -746,7 +746,7 @@ - + @@ -815,24 +815,24 @@ - - - - - + + + + + - + - - - + + + @@ -903,7 +903,7 @@ - + @@ -927,22 +927,22 @@ - + - + - + - - - - + + + + @@ -952,7 +952,7 @@ - + From 79ef727db182eaf12f08e972f6b7575f160da838 Mon Sep 17 00:00:00 2001 From: Shelley Shyan Date: Sun, 31 Jan 2016 12:57:21 +0800 Subject: [PATCH 10/14] Update zh.xml Update zh.xml --- assets/resources/application/zh.xml | 2490 +++++++++++++-------------- 1 file changed, 1245 insertions(+), 1245 deletions(-) diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml index 1527a6798..a3fec7083 100644 --- a/assets/resources/application/zh.xml +++ b/assets/resources/application/zh.xml @@ -1,1249 +1,1249 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From e3f4f6e2ee7bcf4821be50d59f279ed910fbd2a7 Mon Sep 17 00:00:00 2001 From: Shelley Shyan Date: Sun, 31 Jan 2016 13:01:54 +0800 Subject: [PATCH 11/14] Update zh.xml Fix " --- assets/resources/application/zh.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml index a3fec7083..9c4013355 100644 --- a/assets/resources/application/zh.xml +++ b/assets/resources/application/zh.xml @@ -368,7 +368,7 @@ - + From b0782b20d42d66adf846f61c351785ff95192e23 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Tue, 2 Feb 2016 20:39:12 +0000 Subject: [PATCH 12/14] formatting --- assets/resources/application/zh.xml | 2490 +++++++++++++-------------- 1 file changed, 1245 insertions(+), 1245 deletions(-) diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml index 9c4013355..f4e67a3d4 100644 --- a/assets/resources/application/zh.xml +++ b/assets/resources/application/zh.xml @@ -1,1249 +1,1249 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 6cd82f570db2b180fcdbe3f8c39f5f0a29dae5d1 Mon Sep 17 00:00:00 2001 From: MDL Date: Fri, 1 Apr 2016 08:40:54 +0200 Subject: [PATCH 13/14] Update German translation --- assets/resources/application/de.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/resources/application/de.xml b/assets/resources/application/de.xml index 2701928a5..7afa11d08 100644 --- a/assets/resources/application/de.xml +++ b/assets/resources/application/de.xml @@ -4,7 +4,7 @@ - + @@ -443,9 +443,9 @@ - - - + + + @@ -942,8 +942,8 @@ - - + + From 47de11ab2d13bae8ba7d0bb87983754b8205fcd7 Mon Sep 17 00:00:00 2001 From: Trottel Date: Tue, 6 Sep 2016 11:16:41 +0200 Subject: [PATCH 14/14] Update cs.xml --- assets/resources/application/cs.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/resources/application/cs.xml b/assets/resources/application/cs.xml index 40832cc6a..5219584c1 100644 --- a/assets/resources/application/cs.xml +++ b/assets/resources/application/cs.xml @@ -946,8 +946,8 @@ - - + +