[Readthebible-svn] SF.net SVN: readthebible:[90] trunk
Status: Beta
Brought to you by:
vanyo_g
From: <va...@us...> - 2013-11-14 11:23:40
|
Revision: 90 http://sourceforge.net/p/readthebible/code/90 Author: vanyo_g Date: 2013-11-14 11:23:37 +0000 (Thu, 14 Nov 2013) Log Message: ----------- Migration to Mac OS X Mavericks Modified Paths: -------------- trunk/Bible_bg.qm trunk/Bible_bg.ts trunk/bibleWindow.cpp trunk/build.sh trunk/mainWindow.cpp trunk/mainWindow.h trunk/update/update.cpp Modified: trunk/Bible_bg.qm =================================================================== (Binary files differ) Modified: trunk/Bible_bg.ts =================================================================== --- trunk/Bible_bg.ts 2012-10-28 04:00:33 UTC (rev 89) +++ trunk/Bible_bg.ts 2013-11-14 11:23:37 UTC (rev 90) @@ -4,13 +4,12 @@ <context> <name>BMainWindow</name> <message> - <location filename="mainWindow.cpp" line="538"/> <source>Read the Bible 5 - v%1<br>Copyright (C) 2008 Vanyo Georgiev &lt;<A HREF=mailto:in...@va...>in...@va...</A>&gt;<br><A HREF=%2>%2</A><br><br>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 the Free Software Foundation; either version 2 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program; if not, write to the<br><br>Free Software Foundation, Inc.,<br>51 Franklin Street, Fifth Floor,<BR>Boston, MA 02110-1301, USA.</source> <oldsource>CD Bible 5 - v%1<br>Copyright (C) 2008 Vanyo Georgiev &lt;<A HREF=mailto:in...@va...>in...@va...</A>&gt;<br><A HREF=%2>%2</A><br><br>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 the Free Software Foundation; either version 2 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program; if not, write to the<br><br>Free Software Foundation, Inc.,<br>51 Franklin Street, Fifth Floor,<BR>Boston, MA 02110-1301, USA.</oldsource> - <translation>"Компютърна Библия" - %1<br>Авторско право <sup>(C)</sup>: 2008 Ваньо Георгиев &lt;<A HREF=mailto:in...@va...>in...@va...</A>&gt;<br><A HREF=%2>%2</A><br><br>Това е програма с отворен код; Вие можете да я разпространявате и/или променяте според условията на Общото право за публично ползване (GNU GPL) на Фондацията за свободен софтуер; във версия 2 или (по ваше желание) по-следваща версия.<br><br>Тази програма се разпространява с очакване, че е полезна, но БЕЗ НИКАКВИ ГАРАНЦИИ; дори без обичайни гаранции за продаваем продукт или пригодност за каквато и да било цел. За подробности вижте лиценза GNU GPL.<br><br>Вие трябва да сте получили с тази програма копие от Общото право за публично ползване; ако не сте, пишете на:<br><br>Free Software Foundation, Inc.,<br>51 Franklin Street, Fifth Floor,<BR>Boston, MA 02110-1301, USA.</translation> + <translation type="obsolete">"Компютърна Библия" - %1<br>Авторско право <sup>(C)</sup>: 2008 Ваньо Георгиев &lt;<A HREF=mailto:in...@va...>in...@va...</A>&gt;<br><A HREF=%2>%2</A><br><br>Това е програма с отворен код; Вие можете да я разпространявате и/или променяте според условията на Общото право за публично ползване (GNU GPL) на Фондацията за свободен софтуер; във версия 2 или (по ваше желание) по-следваща версия.<br><br>Тази програма се разпространява с очакване, че е полезна, но БЕЗ НИКАКВИ ГАРАНЦИИ; дори без обичайни гаранции за продаваем продукт или пригодност за каквато и да било цел. За подробности вижте лиценза GNU GPL.<br><br>Вие трябва да сте получили с тази програма копие от Общото право за публично ползване; ако не сте, пишете на:<br><br>Free Software Foundation, Inc.,<br>51 Franklin Street, Fifth Floor,<BR>Boston, MA 02110-1301, USA.</translation> </message> <message> - <location filename="mainWindow.cpp" line="748"/> + <location filename="mainWindow.cpp" line="759"/> <source>File %1 is corrupt at line %2.</source> <translation>Файл %1 е повреден на ред %2. </translation> </message> @@ -19,64 +18,69 @@ <translation type="obsolete">Почакайте да се зареди списъка думи...</translation> </message> <message> - <location filename="mainWindow.cpp" line="160"/> + <location filename="mainWindow.cpp" line="164"/> <source>Export as %1 file</source> <translation>Експортиране в %1 формат</translation> </message> <message> - <location filename="mainWindow.cpp" line="184"/> + <location filename="mainWindow.cpp" line="188"/> <source>Import Bible from .txt file</source> <translation>Импортиране на библия от .txt файл.</translation> </message> <message> - <location filename="mainWindow.cpp" line="319"/> - <location filename="mainWindow.cpp" line="338"/> + <location filename="mainWindow.cpp" line="323"/> + <location filename="mainWindow.cpp" line="342"/> <source>Last verse is reached %.</source> <translation>Достигнат е последния стих %.</translation> </message> <message> - <location filename="mainWindow.cpp" line="419"/> + <location filename="mainWindow.cpp" line="423"/> <source>Style changes will take effect next time you strat the Bible program. Click OK to start editing.</source> <oldsource>Changes will take effect next time you strat the Bible program.</oldsource> <translation>Стиловите промени ще се видят при следващо стартиране на програмата. Щракне OK за да започнете редактиране на стиловете.</translation> </message> <message> - <location filename="mainWindow.cpp" line="491"/> + <location filename="mainWindow.cpp" line="499"/> <source>While your are working with version 4.3, the word lists in %1 of the same Bibles wil not be visible.</source> <translation>Докато работите с версия 4.3 списъците с думи на отворените от нея Библии няма да са достъпни във версия %1.</translation> </message> <message> - <location filename="mainWindow.cpp" line="498"/> + <location filename="mainWindow.cpp" line="506"/> <source>This feature is available only for Windows.</source> <translation>Тази функция е достапна само в Windows.</translation> </message> <message> - <location filename="mainWindow.cpp" line="857"/> + <location filename="mainWindow.cpp" line="546"/> + <source>Read the Bible 5 - v%1<br>Copyright (C) 2008 Vanyo Georgiev<br>&lt;<A HREF=mailto:%3>%3</A>&gt;<br><A HREF=%2>%2</A><br><br>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 the Free Software Foundation; either version 2 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program; if not, write to the<br><br>Free Software Foundation, Inc.,<br>51 Franklin Street, Fifth Floor,<BR>Boston, MA 02110-1301, USA.</source> + <translation>"Компютърна Библия" - %1<br>Авторско право <sup>(C)</sup>: 2008 Ваньо Георгиев &lt;<A HREF=mailto:%3>%3</A>&gt;<br><A HREF=%2>%2</A><br><br>Това е програма с отворен код; Вие можете да я разпространявате и/или променяте според условията на Общото право за публично ползване (GNU GPL) на Фондацията за свободен софтуер; във версия 2 или (по ваше желание) по-следваща версия.<br><br>Тази програма се разпространява с очакване, че е полезна, но БЕЗ НИКАКВИ ГАРАНЦИИ; дори без обичайни гаранции за продаваем продукт или пригодност за каквато и да било цел. За подробности вижте лиценза GNU GPL.<br><br>Вие трябва да сте получили с тази програма копие от Общото право за публично ползване; ако не сте, пишете на:<br><br>Free Software Foundation, Inc.,<br>51 Franklin Street, Fifth Floor,<BR>Boston, MA 02110-1301, USA.</translation> + </message> + <message> + <location filename="mainWindow.cpp" line="868"/> <source>Version 4.3 is not Installed. Do you want to download it?</source> <translation>Версия 4.3 не е инсталирана. Искате ли да бъде изтеглена от Интернет?</translation> </message> <message> - <location filename="mainWindow.cpp" line="861"/> + <location filename="mainWindow.cpp" line="872"/> <source>When download on Windows Vista or Windows 7 you have to run this progrm as Administrator.(Right click on C:\Program files (x86)\VanyoG\Bible5\Bible.exe and click on "Run as Administrator"). Do you run it as Administrator?</source> <translation>На Windows Vista или Windows 7, когато изтегляте този файл трябва да сте стартирали "Компютърна Библия" като администратор (Затворете програмата и щракнете с десния бутон на мишката върху файла C:\Program files (x86)\VanyoG\Bible5\Bible.exe и изберете "Run as Administrator"). Така ли сте направили?</translation> </message> <message> - <location filename="mainWindow.cpp" line="869"/> + <location filename="mainWindow.cpp" line="880"/> <source>Version 4.3</source> <translation>Версия 4.3</translation> </message> <message> - <location filename="mainWindow.cpp" line="883"/> + <location filename="mainWindow.cpp" line="894"/> <source>Congratulations. You started the new version %1. Please, write to <a href="mailto:in...@va...">in...@va...</a> for any questions or bug reporting.</source> <translation>Честито! Вие стартирахте новата версия %1 на "Компютърна Библия". Моля, пишете на <a href="mailto:in...@va...">in...@va...</a> по всички въпроси, които имате за тази програма.</translation> </message> <message> - <location filename="mainWindow.cpp" line="889"/> + <location filename="mainWindow.cpp" line="900"/> <source>Open the Bible Translation you like to download and try again.</source> <translation>Първо отворете превода на Библията, който искате да изтеглите отново.</translation> </message> <message> - <location filename="mainWindow.cpp" line="877"/> + <location filename="mainWindow.cpp" line="888"/> <source>Version 4.3 is found in %1. Do you want to use bibles from this version to save disk space.</source> <translation>Версия 4.3 беше намерена в %1. Искате ли да ползвате библиите от тази версия, за да спестите място?</translation> </message> @@ -393,62 +397,77 @@ <translation>Колекции от стихове</translation> </message> <message> - <location filename="mainWindow.ui" line="435"/> + <location filename="mainWindow.ui" line="447"/> <source>New</source> <translation>Нова</translation> </message> <message> - <location filename="mainWindow.ui" line="474"/> + <location filename="mainWindow.ui" line="502"/> + <source>Unselect</source> + <translation>Отмаркиране</translation> + </message> + <message> + <location filename="mainWindow.ui" line="509"/> + <source>Edit</source> + <translation>Редактиране</translation> + </message> + <message> + <location filename="mainWindow.ui" line="516"/> + <source>Finish</source> + <translation>Край</translation> + </message> + <message> + <location filename="mainWindow.ui" line="525"/> <source>&Tile</source> <translation>Един &до друг</translation> </message> <message> - <location filename="mainWindow.ui" line="479"/> + <location filename="mainWindow.ui" line="530"/> <source>&Cascade</source> <translation>Един &върху друг</translation> </message> <message> - <location filename="mainWindow.ui" line="484"/> + <location filename="mainWindow.ui" line="535"/> <source>Close &all</source> <translation>З&атваряне всички</translation> </message> <message> - <location filename="mainWindow.ui" line="489"/> + <location filename="mainWindow.ui" line="540"/> <source>Close &others</source> <translation>Затворяне на &другите</translation> </message> <message> - <location filename="mainWindow.ui" line="492"/> + <location filename="mainWindow.ui" line="543"/> <source>Ctrl+Shift+W</source> <translation>Ctrl+Shift+W</translation> </message> <message> - <location filename="mainWindow.ui" line="503"/> + <location filename="mainWindow.ui" line="554"/> <source>&Searching toolbox</source> <translation>Панел за &търсене</translation> </message> <message> - <location filename="mainWindow.ui" line="778"/> + <location filename="mainWindow.ui" line="829"/> <source>Next Chapter</source> <translation>Следваща глава</translation> </message> <message> - <location filename="mainWindow.ui" line="781"/> + <location filename="mainWindow.ui" line="832"/> <source>PgDown</source> <translation>PgDown</translation> </message> <message> - <location filename="mainWindow.ui" line="786"/> + <location filename="mainWindow.ui" line="837"/> <source>Previous Chapter</source> <translation>Предишна глава</translation> </message> <message> - <location filename="mainWindow.ui" line="789"/> + <location filename="mainWindow.ui" line="840"/> <source>PgUp</source> <translation>PgUp</translation> </message> <message> - <location filename="mainWindow.ui" line="800"/> + <location filename="mainWindow.ui" line="851"/> <source>Verse collectien toolbox</source> <translation>Прозорец за колекции от стихове</translation> </message> @@ -457,97 +476,97 @@ <translation type="obsolete">Относно програмата</translation> </message> <message> - <location filename="mainWindow.ui" line="519"/> + <location filename="mainWindow.ui" line="570"/> <source>About Qt</source> <translation>Относно Qt</translation> </message> <message> - <location filename="mainWindow.ui" line="527"/> + <location filename="mainWindow.ui" line="578"/> <source>&Next window</source> <translation>&Следващ прозорец</translation> </message> <message> - <location filename="mainWindow.ui" line="530"/> + <location filename="mainWindow.ui" line="581"/> <source>Ctrl+`</source> <translation>Ctrl+`</translation> </message> <message> - <location filename="mainWindow.ui" line="643"/> + <location filename="mainWindow.ui" line="694"/> <source>&Color preferences</source> <translation>Предпочитани &цветове</translation> </message> <message> - <location filename="mainWindow.ui" line="651"/> + <location filename="mainWindow.ui" line="702"/> <source>Meta+,</source> <translation>Meta+,</translation> </message> <message> - <location filename="mainWindow.ui" line="659"/> + <location filename="mainWindow.ui" line="710"/> <source>Export as .&txt</source> <translation>Експортиране в .&txt файл</translation> </message> <message> - <location filename="mainWindow.ui" line="664"/> + <location filename="mainWindow.ui" line="715"/> <source>&Styles</source> <translation>&Стилове</translation> </message> <message> - <location filename="mainWindow.ui" line="669"/> + <location filename="mainWindow.ui" line="720"/> <source>Book</source> <translation>Книга</translation> </message> <message> - <location filename="mainWindow.ui" line="672"/> + <location filename="mainWindow.ui" line="723"/> <source>Alt+B</source> <translation>Alt+B</translation> </message> <message> - <location filename="mainWindow.ui" line="680"/> + <location filename="mainWindow.ui" line="731"/> <source>Alt+C</source> <translation>Alt+C</translation> </message> <message> - <location filename="mainWindow.ui" line="688"/> + <location filename="mainWindow.ui" line="739"/> <source>Alt+V</source> <translation>Alt+V</translation> </message> <message> - <location filename="mainWindow.ui" line="693"/> + <location filename="mainWindow.ui" line="744"/> <source>Bigger font</source> <translation>По-едър шрифт</translation> </message> <message> - <location filename="mainWindow.ui" line="696"/> + <location filename="mainWindow.ui" line="747"/> <source>Ctrl+=</source> <translation>Ctrl+=</translation> </message> <message> - <location filename="mainWindow.ui" line="701"/> + <location filename="mainWindow.ui" line="752"/> <source>Smaller font</source> <translation>По-дребен шрифт</translation> </message> <message> - <location filename="mainWindow.ui" line="704"/> + <location filename="mainWindow.ui" line="755"/> <source>Ctrl+-</source> <translation>Ctrl+-</translation> </message> <message> - <location filename="mainWindow.ui" line="709"/> + <location filename="mainWindow.ui" line="760"/> <source>Help Content</source> <translation>Указания за работа</translation> </message> <message> - <location filename="mainWindow.ui" line="712"/> + <location filename="mainWindow.ui" line="763"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="mainWindow.ui" line="717"/> + <location filename="mainWindow.ui" line="768"/> <source>Download again</source> <translation>Повторно изтегляне</translation> </message> <message> - <location filename="mainWindow.ui" line="725"/> + <location filename="mainWindow.ui" line="776"/> <source>Random Verse</source> <translation>Случайно избран стих</translation> </message> @@ -556,62 +575,62 @@ <translation type="obsolete">Alt+R</translation> </message> <message> - <location filename="mainWindow.ui" line="733"/> + <location filename="mainWindow.ui" line="784"/> <source>Import &links</source> <translation>Импортиране на препратки</translation> </message> <message> - <location filename="mainWindow.ui" line="770"/> + <location filename="mainWindow.ui" line="821"/> <source>Import from .txt</source> <translation>Импортиране от .txt</translation> </message> <message> - <location filename="mainWindow.ui" line="773"/> + <location filename="mainWindow.ui" line="824"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="mainWindow.ui" line="738"/> + <location filename="mainWindow.ui" line="789"/> <source>Open application &folder</source> <translation>Отваряне папката на програмата</translation> </message> <message> - <location filename="mainWindow.ui" line="506"/> + <location filename="mainWindow.ui" line="557"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> <message> - <location filename="mainWindow.ui" line="728"/> + <location filename="mainWindow.ui" line="779"/> <source>Ctrl+Shift+R</source> <translation>Ctrl+Shift+R</translation> </message> <message> - <location filename="mainWindow.ui" line="741"/> + <location filename="mainWindow.ui" line="792"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="mainWindow.ui" line="746"/> + <location filename="mainWindow.ui" line="797"/> <source>Readme file</source> <translation>Файл "Прочети ме"</translation> </message> <message> - <location filename="mainWindow.ui" line="751"/> + <location filename="mainWindow.ui" line="802"/> <source>Open again</source> <translation>Отваряне отново</translation> </message> <message> - <location filename="mainWindow.ui" line="754"/> + <location filename="mainWindow.ui" line="805"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="mainWindow.ui" line="762"/> + <location filename="mainWindow.ui" line="813"/> <source>Stay on top</source> <translation>Стой отгоре</translation> </message> <message> - <location filename="mainWindow.ui" line="765"/> + <location filename="mainWindow.ui" line="816"/> <source>Ctrl+T</source> <translation>Ctrl+T</translation> </message> @@ -624,22 +643,22 @@ <translation type="obsolete">Записване като .html</translation> </message> <message> - <location filename="mainWindow.ui" line="538"/> + <location filename="mainWindow.ui" line="589"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="mainWindow.ui" line="543"/> + <location filename="mainWindow.ui" line="594"/> <source>Close current</source> <translation>Затваряне текущия</translation> </message> <message> - <location filename="mainWindow.ui" line="546"/> + <location filename="mainWindow.ui" line="597"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message utf8="true"> - <location filename="mainWindow.ui" line="551"/> + <location filename="mainWindow.ui" line="602"/> <source>Стих</source> <translation>Стих</translation> </message> @@ -653,23 +672,23 @@ <translation type="obsolete">1</translation> </message> <message> - <location filename="mainWindow.ui" line="556"/> + <location filename="mainWindow.ui" line="607"/> <source>&Web site</source> <translation>Интернет &сайт</translation> </message> <message> - <location filename="mainWindow.ui" line="561"/> + <location filename="mainWindow.ui" line="612"/> <source>Check for &updates</source> <translation>Проверка за нова & версия</translation> </message> <message> - <location filename="mainWindow.ui" line="566"/> + <location filename="mainWindow.ui" line="617"/> <source>About Bible &Version</source> <translation>Относно изданието на &Библията</translation> </message> <message> - <location filename="mainWindow.ui" line="571"/> + <location filename="mainWindow.ui" line="622"/> <source>&Quit</source> <translation>&Изход</translation> </message> @@ -679,32 +698,32 @@ <translation>&Движение</translation> </message> <message> - <location filename="mainWindow.ui" line="511"/> + <location filename="mainWindow.ui" line="562"/> <source>About Read the Bible 5</source> <translation>Оотносно Компютърна Библия - версия 5</translation> </message> <message> - <location filename="mainWindow.ui" line="535"/> + <location filename="mainWindow.ui" line="586"/> <source>Export as .&html</source> <translation>Експортиране в .&html файл</translation> </message> <message> - <location filename="mainWindow.ui" line="582"/> + <location filename="mainWindow.ui" line="633"/> <source>Next Verse</source> <translation>Следващ стих</translation> </message> <message> - <location filename="mainWindow.ui" line="585"/> + <location filename="mainWindow.ui" line="636"/> <source>Alt+Down</source> <translation>Alt+Down</translation> </message> <message> - <location filename="mainWindow.ui" line="590"/> + <location filename="mainWindow.ui" line="641"/> <source>Previous Verse</source> <translation>Предишен стих</translation> </message> <message> - <location filename="mainWindow.ui" line="593"/> + <location filename="mainWindow.ui" line="644"/> <source>Alt+Up</source> <translation>Alt+Up</translation> </message> @@ -719,19 +738,19 @@ </message> <message> <location filename="mainWindow.ui" line="243"/> - <location filename="mainWindow.ui" line="677"/> + <location filename="mainWindow.ui" line="728"/> <source>Chapter</source> <translation>Глава</translation> </message> <message> <location filename="mainWindow.ui" line="268"/> - <location filename="mainWindow.ui" line="685"/> + <location filename="mainWindow.ui" line="736"/> <source>Verse</source> <translation>Стих</translation> </message> <message> - <location filename="mainWindow.ui" line="598"/> - <location filename="mainWindow.ui" line="648"/> + <location filename="mainWindow.ui" line="649"/> + <location filename="mainWindow.ui" line="699"/> <source>&Preferences</source> <translation>&Настройки</translation> </message> @@ -740,7 +759,7 @@ <translation type="obsolete">Показване списък думи</translation> </message> <message> - <location filename="mainWindow.ui" line="601"/> + <location filename="mainWindow.ui" line="652"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> @@ -773,52 +792,52 @@ <translation type="obsolete">100</translation> </message> <message> - <location filename="mainWindow.ui" line="606"/> + <location filename="mainWindow.ui" line="657"/> <source>CrossBgBible</source> <translation>CrossBgBible</translation> </message> <message> - <location filename="mainWindow.ui" line="611"/> + <location filename="mainWindow.ui" line="662"/> <source>&Back</source> <translation>На&зад</translation> </message> <message> - <location filename="mainWindow.ui" line="614"/> + <location filename="mainWindow.ui" line="665"/> <source>Alt+,</source> <translation>Alt+,</translation> </message> <message> - <location filename="mainWindow.ui" line="619"/> + <location filename="mainWindow.ui" line="670"/> <source>&Forward</source> <translation>На&пред</translation> </message> <message> - <location filename="mainWindow.ui" line="622"/> + <location filename="mainWindow.ui" line="673"/> <source>Alt+.</source> <translation>Alt+.</translation> </message> <message> - <location filename="mainWindow.ui" line="574"/> + <location filename="mainWindow.ui" line="625"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="mainWindow.ui" line="627"/> + <location filename="mainWindow.ui" line="678"/> <source>Version 4.3</source> <translation>Версия 4.3</translation> </message> <message> - <location filename="mainWindow.ui" line="630"/> + <location filename="mainWindow.ui" line="681"/> <source>F4</source> <translation>F4</translation> </message> <message> - <location filename="mainWindow.ui" line="635"/> + <location filename="mainWindow.ui" line="686"/> <source>Verse for reading</source> <translation>Място на четене</translation> </message> <message> - <location filename="mainWindow.ui" line="638"/> + <location filename="mainWindow.ui" line="689"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> @@ -981,10 +1000,14 @@ <context> <name>VerseCollection</name> <message> - <location filename="verseCollection.cpp" line="39"/> <source>New collection</source> - <translation>Нова колекция</translation> + <translation type="obsolete">Нова колекция</translation> </message> + <message> + <location filename="verseCollection.cpp" line="70"/> + <source>New collection %1</source> + <translation>Нова колекция %1</translation> + </message> </context> <context> <name>WebUpdater</name> Modified: trunk/bibleWindow.cpp =================================================================== --- trunk/bibleWindow.cpp 2012-10-28 04:00:33 UTC (rev 89) +++ trunk/bibleWindow.cpp 2013-11-14 11:23:37 UTC (rev 90) @@ -39,7 +39,7 @@ QProgressBar *downloadProgressBar = 0; QPushButton *dounloadCancelButton = 0; -QString bible_Path = "data/bibles/"; +QString bible_Path = "not set"; QHash<QString, int> read_pos; //QHash<QString, ConcordanceModel*> concordanceHash; @@ -1026,7 +1026,7 @@ }; void readGlobalStructure(){ - global_structure = readStructure("data/bibles/Bible_Structure.txt"); + global_structure = readStructure(bible_Path+"Bible_Structure.txt"); }; BibleStructure *readStructure(const QString &fn){ Modified: trunk/build.sh =================================================================== --- trunk/build.sh 2012-10-28 04:00:33 UTC (rev 89) +++ trunk/build.sh 2013-11-14 11:23:37 UTC (rev 90) @@ -2,6 +2,7 @@ rm -rf Bible.app rm -rf update.app +rm -f build/*.* qmake -spec macx-g++ make Modified: trunk/mainWindow.cpp =================================================================== --- trunk/mainWindow.cpp 2012-10-28 04:00:33 UTC (rev 89) +++ trunk/mainWindow.cpp 2013-11-14 11:23:37 UTC (rev 90) @@ -41,15 +41,17 @@ #include <QTime> #include <QFileDialog> -QString progVersion = "5.1.0"; -QString progURL = "http://readthebible.sourceforge.net"; +QString progVersion = "5.1.1"; +QString progURL = "http://readthebible.sourceforge.net/index.php?l="; +QString progEmail = "rea...@li..."; +QString prog_Dir; #ifdef Q_WS_WIN - QString styleFile = "data/style-w.css"; + QString styleFile = "style-w.css"; #else #ifdef Q_WS_MAC - QString styleFile = "data/style.css"; + QString styleFile = "style.css"; #else - QString styleFile = "data/style-w.css"; + QString styleFile = "style-w.css"; #endif #endif @@ -533,15 +535,16 @@ }; void BMainWindow::onHelpContent(){ - myProcess->browse("htdocs/help/help.html"); + myProcess->browse(prog_Dir + "htdocs/help/help.html"); }; void BMainWindow::onHelpReadme(){ - myProcess->browse("htdocs/readme-"+interfaceLanguage()+".html"); + myProcess->browse(prog_Dir + "htdocs/readme-"+interfaceLanguage()+".html"); }; void BMainWindow::onHelpAboutProgram(){ - showMessage(tr("Read the Bible 5 - v%1<br>Copyright (C) 2008 Vanyo Georgiev <<A HREF=mailto:in...@va...>in...@va...</A>><br><A HREF=%2>%2</A><br><br>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 the Free Software Foundation; either version 2 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program; if not, write to the<br><br>Free Software Foundation, Inc.,<br>51 Franklin Street, Fifth Floor,<BR>Boston, MA 02110-1301, USA.").arg(progVersion).arg(progURL) ); + showMessage(tr("Read the Bible 5 - v%1<br>Copyright (C) 2008 Vanyo Georgiev<br><<A HREF=mailto:%3>%3</A>><br><A HREF=%2>%2</A><br><br>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 the Free Software Foundation; either version 2 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program; if not, write to the<br><br>Free Software Foundation, Inc.,<br>51 Franklin Street, Fifth Floor,<BR>Boston, MA 02110-1301, USA."). + arg(progVersion).arg(progURL+interfaceLanguage()).arg(progEmail) ); }; void BMainWindow::onHelpAboutBibleVersion(){ @@ -551,7 +554,7 @@ }; void BMainWindow::onHelpWebSite(){ - myProcess->browse("http://"+downloadSite()+"/bible/v5"); + myProcess->browse(progURL+interfaceLanguage()); }; void BMainWindow::onHelpCheckForUpdate(){ @@ -724,7 +727,9 @@ }; void BMainWindow::createBActions(){ - QString fn = "data/bibles/list-u.txt"; + styleFile = prog_Dir + "data/"+styleFile; + QString fn = prog_Dir+"data/bibles/list-u.txt"; + setBiblePath(prog_Dir+"data/bibles/"); QString fc = fileContent(fn,"UTF-8"), lng = ""; QStringList bs = fc.split("\n"); bool said = false; @@ -912,3 +917,14 @@ return int_lang; }; +QString progDir(){ + return prog_Dir; +} + +void setProgDir(){ + prog_Dir = qApp->applicationFilePath(); +#ifdef Q_WS_MAC + int l = QDir(prog_Dir).dirName().size(); + prog_Dir = prog_Dir.left(prog_Dir.size()-2*l-20); +#endif +} \ No newline at end of file Modified: trunk/mainWindow.h =================================================================== --- trunk/mainWindow.h 2012-10-28 04:00:33 UTC (rev 89) +++ trunk/mainWindow.h 2013-11-14 11:23:37 UTC (rev 90) @@ -145,6 +145,8 @@ void setIntegfaceLanguage(); QString interfaceLanguage(); +QString progDir(); +void setProgDir(); #endif Modified: trunk/update/update.cpp =================================================================== --- trunk/update/update.cpp 2012-10-28 04:00:33 UTC (rev 89) +++ trunk/update/update.cpp 2013-11-14 11:23:37 UTC (rev 90) @@ -17,6 +17,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +// Главен файл на помощна програма, която извършва актуализирането до по-нова версия +// В момента не функционира добре, трябва да и се оправят бъговете + #include <QTranslator> #include <QLocale> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |