Commit 6eecf959 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen
Browse files

Merge branch 'master' into chouquette_sound_workflow

parents d973bab7 591176c5
......@@ -25,3 +25,6 @@ Marián Hikaník <podnety@mojepreklady.net>
Swedish:
Daniel Nylander <po@danielnylander.se>
Ukrainian:
Коростіль Данило <ted.korostiled@gmail.com>
<RCC>
<qresource prefix="/Lang">
<file alias="cs">ts/vlmc_cs.qm</file>
<file alias="es">ts/vlmc_es.qm</file>
<file alias="fr">ts/vlmc_fr.qm</file>
<file alias="sv">ts/vlmc_sv.qm</file>
......@@ -8,5 +7,6 @@
<file alias="ja_JP">ts/vlmc_ja_JP.qm</file>
<file alias="it">ts/vlmc_it.qm</file>
<file alias="sk">ts/vlmc_sk.qm</file>
<file alias="uk">ts/vlmc_uk.qm</file>
</qresource>
</RCC>
......@@ -61,11 +61,7 @@ void VLMCSettingsDefault::loadlanguageDefaults( const QString& part )
{
SettingsManager* setMan = SettingsManager::getInstance();
QVariant defaultLang = "fr";
setMan->setValue( part,
"VLMCLang",
defaultLang );
setMan->setValue( part, "VLMCLang", "en_US" );
return ;
}
......
......@@ -35,14 +35,15 @@ LanguagePreferences::LanguagePreferences( QWidget *parent )
{
m_ui.setupUi( this );
QDir dir( "ts/", "*.ts", QDir::Name | QDir::IgnoreCase, QDir::Files );
QDir dir( "ts/", "*.qm", QDir::Name | QDir::IgnoreCase, QDir::Files );
QStringList tss = dir.entryList();
m_ui.comboBoxLanguage->setInsertPolicy( QComboBox::InsertAlphabetically );
foreach ( const QString& tsFileName, tss )
{
QString localeStr;
int localePos = tsFileName.lastIndexOf( "vlmc_");
int dotPos = tsFileName.lastIndexOf( ".ts" );
int dotPos = tsFileName.lastIndexOf( ".qm" );
if ( localePos < 0 || dotPos < 0 )
{
qWarning() << "Invalid translation file:" << tsFileName;
......@@ -51,10 +52,12 @@ LanguagePreferences::LanguagePreferences( QWidget *parent )
localePos += 5;
localeStr = tsFileName.mid( localePos, dotPos - localePos );
QLocale locale( localeStr );
qDebug() << "Adding new language:" << QLocale::countryToString( locale.country() ) << '/' <<
QLocale::languageToString( locale.language() ) << "with locale" << localeStr;
m_ui.comboBoxLanguage->addItem( QLocale::countryToString( locale.country() ) + " / "
+ QLocale::languageToString( locale.language() ), localeStr );
}
m_ui.comboBoxLanguage->addItem( "UnitedStates / English", "en" );
m_ui.comboBoxLanguage->addItem( "UnitedStates / English", "en_US" );
}
LanguagePreferences::~LanguagePreferences() {}
......@@ -62,9 +65,9 @@ LanguagePreferences::~LanguagePreferences() {}
void LanguagePreferences::load()
{
const QString& part = m_defaults ? "default" : m_settName;
SettingsManager* setMan = SettingsManager::getInstance();
QVariant lang = setMan->getValue( part, "VLMCLang" );
int idx = m_ui.comboBoxLanguage->findData( lang );
SettingsManager *setMan = SettingsManager::getInstance();
const SettingValue *lang = setMan->getValue( part, "VLMCLang" );
int idx = m_ui.comboBoxLanguage->findData( lang->get() );
if ( idx != -1 )
m_ui.comboBoxLanguage->setCurrentIndex( idx );
......
......@@ -109,7 +109,6 @@ void MediaCellView::mousePressEvent( QMouseEvent* event )
void MediaCellView::mouseMoveEvent( QMouseEvent* event )
{
qDebug() << "in MediaCellView::mouseMoveEvent";
if ( ( event->buttons() | Qt::LeftButton ) != Qt::LeftButton )
return;
......@@ -152,7 +151,6 @@ void MediaCellView::deleteButtonClicked( QWidget*, QMouseEvent* )
void MediaCellView::arrowButtonClicked( QWidget*, QMouseEvent* )
{
qDebug() << "arrow clicked for uuid" << uuid();
emit arrowClicked( uuid() );
}
......
......@@ -74,7 +74,6 @@ void StackViewController::pushViewController( ViewController* viewController,
}
m_current = viewController;
qDebug() << "title :" << &m_current->title();
m_nav->setTitle( m_current->title() );
m_layout->insertWidget( 1, m_current->view() );
}
......
......@@ -71,8 +71,8 @@ INCLUDEPATH += $$VLMC_DIRS \
DEPENDPATH += $$VLMC_DIRS
# Add traduction here, it will be automatically build by the next line.
TRANSLATIONS_LIST = cs es fr ja_JP sv pt_BR sk it
# Add translations here, it will be automatically build by the next line.
TRANSLATIONS_LIST = es fr ja_JP sv pt_BR sk it uk
# Add every translation in the TRANSLATION variable
for(lang, TRANSLATIONS_LIST):exists( ../ts/vlmc_$${lang}.ts ):TRANSLATIONS += ../ts/vlmc_$${lang}.ts
......
This diff is collapsed.
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="uk" sourcelanguage="en">
<defaultcodec>UTF-8</defaultcodec>
<context>
<name>AboutVLMC</name>
<message>
<location filename="../src/GUI/ui/About.ui" line="20"/>
<location filename="../src/GUI/ui/About.ui" line="76"/>
<source>About</source>
<translation>Про програму</translation>
</message>
<message>
<location filename="../src/GUI/ui/About.ui" line="48"/>
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;VideoLAN Movie Creator&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://www.vlmc.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#b1ca00;&quot;&gt;http://www.vlmc.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Кінотворець VideoLAN&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://www.vlmc.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#b1ca00;&quot;&gt;http://www.vlmc.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../src/GUI/ui/About.ui" line="85"/>
<source>Version: %1</source>
<translation>Версія: %1</translation>
</message>
<message>
<location filename="../src/GUI/ui/About.ui" line="106"/>
<source>Authors</source>
<translation>Автори</translation>
</message>
<message>
<location filename="../src/GUI/ui/About.ui" line="120"/>
<source>Translators</source>
<translation>Перекладачі</translation>
</message>
<message>
<location filename="../src/GUI/ui/About.ui" line="134"/>
<source>License</source>
<translation>Ліцензія</translation>
</message>
</context>
<context>
<name>AudioProjectPreferences</name>
<message>
<location filename="../src/GUI/settings/ui/AudioProjectPreferences.ui" line="14"/>
<source>Form</source>
<translation>Форма</translation>
</message>
<message>
<location filename="../src/GUI/settings/ui/AudioProjectPreferences.ui" line="20"/>
<source>SampleRate</source>
<translation>Частота дискретизації</translation>
</message>
</context>
<context>
<name>ClipProperty</name>
<message>
<location filename="../src/GUI/ClipProperty.cpp" line="46"/>
<source>properties</source>
<translation>властивості</translation>
</message>
<message>
<location filename="../src/GUI/ClipProperty.cpp" line="97"/>
<source>New tags edition</source>
<translation>Нова позначка видання</translation>
</message>
<message>
<location filename="../src/GUI/ClipProperty.cpp" line="98"/>
<source>Enter tags (you can enter multiple tags, separated by a comma)</source>
<translation>Введіть позначку (ви можете ввести кілька позначок, виділивши їх комами)</translation>
</message>
<message>
<location filename="../src/GUI/ui/ClipProperty.ui" line="53"/>
<source>TextLabel</source>
<translation>Текстовий надпис</translation>
</message>
<message>
<location filename="../src/GUI/ui/ClipProperty.ui" line="82"/>
<source>Media Properties</source>
<translation>Властивості матеріалу</translation>
</message>
<message>
<location filename="../src/GUI/ui/ClipProperty.ui" line="88"/>
<source>Name</source>
<translation>Назва</translation>
</message>
<message>
<location filename="../src/GUI/ui/ClipProperty.ui" line="95"/>
<source>unnamed</source>
<translation>неназваний</translation>
</message>
<message>
<location filename="../src/GUI/ui/ClipProperty.ui" line="102"/>
<source>Duration</source>
<translation>Тривалість</translation>
</message>
<message>
<location filename="../src/GUI/ui/ClipProperty.ui" line="109"/>
<source>0s</source>
<translation>0</translation>
</message>
<message>
<location filename="../src/GUI/ui/ClipProperty.ui" line="122"/>
<source>Resolution</source>
<translation>Роздільність</translation>
</message>
<message>
<location filename="../src/GUI/ui/ClipProperty.ui" line="135"/>
<source>0px. x 0px.</source>
<translation>0px. x 0px.</translation>
</message>
<message>
<location filename="../src/GUI/ui/ClipProperty.ui" line="148"/>
<source>FPS</source>
<translation>Кадрів за секунду</translation>
</message>
<message>
<location filename="../src/GUI/ui/ClipProperty.ui" line="155"/>
<source>0</source>
<translation>0</translation>
</message>
<message>
<location filename="../src/GUI/ui/ClipProperty.ui" line="165"/>
<source>Metatags :</source>
<translation>Дані про позначки :</translation>
</message>
<message>
<location filename="../src/GUI/ui/ClipProperty.ui" line="214"/>
<location filename="../src/GUI/ui/ClipProperty.ui" line="225"/>
<source>...</source>
<translation></translation>
</message>
<message>
<location filename="../src/GUI/ui/ClipProperty.ui" line="239"/>
<source>Annotations :</source>
<translation>Зауваження :</translation>
</message>
</context>
<context>
<name>FileBrowser</name>
<message>
<location filename="../src/GUI/ui/FileBrowser.ui" line="20"/>
<source>Form</source>
<translation>Форма</translation>
</message>
</context>
<context>
<name>GraphicsAudioItem</name>
<message>
<location filename="../src/GUI/GraphicsAudioItem.cpp" line="37"/>
<source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;b&gt;Name:&lt;/b&gt; %1&lt;br&gt;&lt;b&gt;Length:&lt;/b&gt; %2</source>
<translation>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;b&gt;Назва:&lt;/b&gt; %1&lt;br&gt;&lt;b&gt;Довжина:&lt;/b&gt; %2</translation>
</message>
</context>
<context>
<name>GraphicsMovieItem</name>
<message>
<location filename="../src/GUI/GraphicsMovieItem.cpp" line="36"/>
<source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;b&gt;Name:&lt;/b&gt; %1&lt;br&gt;&lt;b&gt;Length:&lt;/b&gt; %2</source>
<translation>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;b&gt;Назва:&lt;/b&gt; %1&lt;br&gt;&lt;b&gt;Довжина:&lt;/b&gt; %2</translation>
</message>
</context>
<context>
<name>ImportController</name>
<message>
<location filename="../src/GUI/import/ImportController.cpp" line="149"/>
<source>properties</source>
<translation>властивості</translation>
</message>
<message>
<location filename="../src/GUI/import/ui/ImportController.ui" line="14"/>
<location filename="../src/GUI/ui/Import.ui" line="32"/>
<source>Import</source>
<translation>Імпорт</translation>
</message>
<message>
<location filename="../src/GUI/import/ui/ImportController.ui" line="80"/>
<location filename="../src/GUI/ui/Import.ui" line="79"/>
<source>Media Properties</source>
<translation>Властивості матеріалу</translation>
</message>
<message>
<location filename="../src/GUI/import/ui/ImportController.ui" line="86"/>
<location filename="../src/GUI/ui/Import.ui" line="85"/>
<source>Name</source>
<translation>Назва</translation>
</message>
<message>
<location filename="../src/GUI/import/ui/ImportController.ui" line="93"/>
<location filename="../src/GUI/ui/Import.ui" line="92"/>
<source>unnamed</source>
<translation>неназваний</translation>
</message>
<message>
<location filename="../src/GUI/import/ui/ImportController.ui" line="100"/>
<location filename="../src/GUI/ui/Import.ui" line="99"/>
<source>Duration</source>
<translation>Тривалість</translation>
</message>
<message>
<location filename="../src/GUI/import/ui/ImportController.ui" line="107"/>
<location filename="../src/GUI/ui/Import.ui" line="106"/>
<source>0s</source>
<translation>0</translation>
</message>
<message>
<location filename="../src/GUI/import/ui/ImportController.ui" line="120"/>
<location filename="../src/GUI/ui/Import.ui" line="119"/>
<source>Resolution</source>
<translation>Роздільність</translation>
</message>
<message>
<location filename="../src/GUI/import/ui/ImportController.ui" line="133"/>
<location filename="../src/GUI/ui/Import.ui" line="132"/>
<source>0px. x 0px.</source>
<translation>0px. x 0px.</translation>
</message>
<message>
<location filename="../src/GUI/import/ui/ImportController.ui" line="146"/>
<location filename="../src/GUI/ui/Import.ui" line="145"/>
<source>FPS</source>
<translation>Кадрів за секунду</translation>
</message>
<message>
<location filename="../src/GUI/import/ui/ImportController.ui" line="153"/>
<location filename="../src/GUI/ui/Import.ui" line="152"/>
<source>0</source>
<translation>0</translation>
</message>
</context>
<context>
<name>ImportModel</name>
<message>
<location filename="../src/GUI/import/ImportModel.cpp" line="108"/>
<source>Error while loading media(s):
%0</source>
<translation>Помилка при завантаженні одного чи кількох матеріалів:
%0</translation>
</message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
<location filename="../src/GUI/LanguagePreferences.cpp" line="35"/>
<source>English</source>
<translation>Англійська</translation>
</message>
<message>
<location filename="../src/GUI/LanguagePreferences.cpp" line="36"/>
<source>French</source>
<translation>Французька</translation>
</message>
<message>
<location filename="../src/GUI/LanguagePreferences.cpp" line="37"/>
<source>Spanish</source>
<translation>Іспанська</translation>
</message>
<message>
<location filename="../src/GUI/LanguagePreferences.cpp" line="38"/>
<source>Swedish</source>
<translation>Шведська</translation>
</message>
<message>
<location filename="../src/GUI/settings/ui/LanguagePreferences.ui" line="14"/>
<source>Form</source>
<translation>Форма</translation>
</message>
<message>
<location filename="../src/GUI/settings/ui/LanguagePreferences.ui" line="20"/>
<source>Language</source>
<translation>Мова</translation>
</message>
</context>
<context>
<name>LibraryWidget</name>
<message>
<location filename="../src/GUI/LibraryWidget.cpp" line="163"/>
<source>Open Audios</source>
<translation>Відкрити аудіо</translation>
</message>
<message>
<location filename="../src/GUI/LibraryWidget.cpp" line="164"/>
<source>Audio Files</source>
<translation>Аудіофайл</translation>
</message>
<message>
<location filename="../src/GUI/LibraryWidget.cpp" line="169"/>
<source>Video Files</source>
<translation>Відеофайл</translation>
</message>
<message>
<location filename="../src/GUI/LibraryWidget.cpp" line="174"/>
<source>Images Files</source>
<translation>Фотофайл</translation>
</message>
<message>
<location filename="../src/GUI/LibraryWidget.cpp" line="168"/>
<source>Open Videos</source>
<translation>Відкрити відео</translation>
</message>
<message>
<location filename="../src/GUI/LibraryWidget.cpp" line="173"/>
<source>Open Images</source>
<translation>Відкрити зображення</translation>
</message>
<message>
<location filename="../src/GUI/ui/LibraryWidget.ui" line="14"/>
<source>Form</source>
<translation>Форма</translation>
</message>
<message>
<location filename="../src/GUI/ui/LibraryWidget.ui" line="36"/>
<source>Audio</source>
<translation>Аудіо</translation>
</message>
<message>
<location filename="../src/GUI/ui/LibraryWidget.ui" line="74"/>
<source>Videos</source>
<translation>Відео</translation>
</message>
<message>
<location filename="../src/GUI/ui/LibraryWidget.ui" line="109"/>
<source>Images</source>
<translation>Зображення</translation>
</message>
<message>
<location filename="../src/GUI/ui/LibraryWidget.ui" line="150"/>
<source>Add Media</source>
<translation>Долучити носій</translation>
</message>
<message>
<location filename="../src/GUI/ui/LibraryWidget.ui" line="166"/>
<source>Remove Media</source>
<translation>Вилучити носій</translation>
</message>
<message>
<location filename="../src/GUI/ui/LibraryWidget.ui" line="189"/>
<source>Filter:</source>
<translation>Фільтр:</translation>
</message>
<message>
<location filename="../src/GUI/ui/LibraryWidget.ui" line="196"/>
<source>...</source>
<translation></translation>
</message>
</context>
<context>
<name>LoadPage</name>
<message>
<location filename="../src/GUI/wizard/LoadPage.cpp" line="32"/>
<source>Welcome to the project Wizard.
This wizard will allow you to createa new project, or to open an existing project.
To open an existing project, click on the button below,or click next to create a new project</source>
<translation>Ласкаво просимо до майстра проектів.
Цей майстер дозволить вам робити нові проекти, або відкривати наявні.
Щоб відкрити наявний проект, натисніть на кнопку нижче, або натисніть сусідню, щоб створити новий</translation>
</message>
<message>
<location filename="../src/GUI/wizard/LoadPage.cpp" line="37"/>
<source>Open Existing Project</source>
<translation>Відкрити наявний проект</translation>
</message>
</context>
<context>
<name>MainWindow</name>
<message>
<location filename="../src/GUI/MainWindow.cpp" line="134"/>
<location filename="../src/GUI/ui/MainWindow.ui" line="123"/>
<source>Media Library</source>
<translation>Медіабібліотека</translation>
</message>
<message>
<location filename="../src/GUI/MainWindow.cpp" line="283"/>
<source>FileBrowser</source>
<translation>Файлонавігатор</translation>
</message>
<message>
<location filename="../src/GUI/MainWindow.cpp" line="290"/>
<source>Clip Preview</source>
<translation>Перегляд обрізу</translation>
</message>
<message>
<location filename="../src/GUI/MainWindow.cpp" line="294"/>
<source>Ctrl+Return</source>
<comment>Start clip preview</comment>
<translation>Ctrl+Return</translation>
</message>
<message>
<location filename="../src/GUI/MainWindow.cpp" line="299"/>
<source>Project Preview</source>
<translation>Перегляд проекту</translation>
</message>
<message>
<location filename="../src/GUI/MainWindow.cpp" line="303"/>
<source>Space</source>
<comment>Start render preview</comment>
<translation>Простір</translation>
</message>
<message>
<location filename="../src/GUI/MainWindow.cpp" line="307"/>
<source>History</source>
<translation>Журнал</translation>
</message>
<message>
<location filename="../src/GUI/MainWindow.cpp" line="366"/>
<source>Sorry</source>
<translation>Вибачте</translation>
</message>
<message>
<location filename="../src/GUI/MainWindow.cpp" line="367"/>
<source>This feature is currently disabled.</source>
<translation>Поки що цю властивість вимкнено.</translation>
</message>
<message>
<location filename="../src/GUI/ui/MainWindow.ui" line="134"/>
<source>Preview</source>
<translation>Перегляд</translation>
</message>
<message>
<location filename="../src/GUI/ui/MainWindow.ui" line="14"/>
<source>VideoLAN Movie Creator</source>
<translation>Кінотворець VideoLAN</translation>
</message>
<message>
<location filename="../src/GUI/ui/MainWindow.ui" line="35"/>
<source>File</source>
<translation>Файл</translation>
</message>
<message>
<location filename="../src/GUI/ui/MainWindow.ui" line="46"/>
<source>Edit</source>
<translation>Правка</translation>
</message>
<message>
<location filename="../src/GUI/ui/MainWindow.ui" line="53"/>
<source>View</source>
<translation>Огляд</translation>
</message>
<message>
<location filename="../src/GUI/ui/MainWindow.ui" line="62"/>
<source>Effects</source>
<translation>Впливи</translation>
</message>
<message>
<location filename="../src/GUI/ui/MainWindow.ui" line="68"/>
<source>Tools</source>
<translation>Інструменти</translation>
</message>
<message>
<location filename="../src/GUI/ui/MainWindow.ui" line="75"/>