Merge branch 'fork_branch'

This commit is contained in:
Martin Rotter 2016-06-22 21:06:53 +02:00
commit c8e2bebd83
22 changed files with 67 additions and 67 deletions

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="cs_CZ">
<TS version="2.1" language="cs">
<context>
<name>CloseButton</name>
<message>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="da_DK">
<TS version="2.1" language="da">
<context>
<name>AudioOutput</name>
<message>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="de_DE">
<TS version="2.1" language="de">
<context>
<name>CloseButton</name>
<message>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="fr_FR">
<TS version="2.1" language="fr">
<context>
<name>CloseButton</name>
<message>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="he_IL">
<TS version="2.1" language="he">
<context>
<name>CloseButton</name>
<message>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="it_IT">
<TS version="2.0" language="it">
<context>
<name>CloseButton</name>
<message>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="sv_SE">
<TS version="2.1" language="sv">
<context>
<name>CloseButton</name>
<message>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs_CZ" version="2.1">
<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs" version="2.1">
<context>
<name>AccountCheckModel</name>
<message>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="da_DK" version="2.1">
<?xml version="1.0" ?><!DOCTYPE TS><TS language="da" version="2.1">
<context>
<name>AccountCheckModel</name>
<message>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="de_DE" version="2.1">
<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.1">
<context>
<name>AccountCheckModel</name>
<message>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="en_US" version="2.1">
<?xml version="1.0" ?><!DOCTYPE TS><TS language="en" version="2.1">
<context>
<name>AccountCheckModel</name>
<message>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_FR" version="2.1">
<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" version="2.1">
<context>
<name>AccountCheckModel</name>
<message>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="he_IL" version="2.1">
<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.1">
<context>
<name>AccountCheckModel</name>
<message>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="id_ID" version="2.1">
<?xml version="1.0" ?><!DOCTYPE TS><TS language="id" version="2.1">
<context>
<name>AccountCheckModel</name>
<message>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="it_IT" version="2.1">
<?xml version="1.0" ?><!DOCTYPE TS><TS language="it" version="2.1">
<context>
<name>AccountCheckModel</name>
<message>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="ja_JP" version="2.1">
<?xml version="1.0" ?><!DOCTYPE TS><TS language="ja" version="2.1">
<context>
<name>AccountCheckModel</name>
<message>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="lt_LT" version="2.1">
<?xml version="1.0" ?><!DOCTYPE TS><TS language="lt" version="2.1">
<context>
<name>AccountCheckModel</name>
<message>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl_NL" version="2.1">
<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.1">
<context>
<name>AccountCheckModel</name>
<message>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.1">
<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt" version="2.1">
<context>
<name>AccountCheckModel</name>
<message>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="sv_SE" version="2.1">
<?xml version="1.0" ?><!DOCTYPE TS><TS language="sv" version="2.1">
<context>
<name>AccountCheckModel</name>
<message>

View File

@ -397,43 +397,43 @@ FORMS += \
src/services/standard/gui/formstandardimportexport.ui \
src/services/tt-rss/gui/formeditaccount.ui
TRANSLATIONS += localization/qtbase-cs_CZ.ts \
localization/qtbase-da_DK.ts \
localization/qtbase-de_DE.ts \
localization/qtbase-fr_FR.ts \
localization/qtbase-he_IL.ts \
localization/qtbase-it_IT.ts \
localization/qtbase-ja_JP.ts \
localization/qtbase-sv_SE.ts \
localization/rssguard-cs_CZ.ts \
localization/rssguard-da_DK.ts \
localization/rssguard-de_DE.ts \
TRANSLATIONS += localization/qtbase-cs.ts \
localization/qtbase-da.ts \
localization/qtbase-de.ts \
localization/qtbase-fr.ts \
localization/qtbase-he.ts \
localization/qtbase-it.ts \
localization/qtbase-ja.ts \
localization/qtbase-sv.ts \
localization/rssguard-cs.ts \
localization/rssguard-da.ts \
localization/rssguard-de.ts \
localization/rssguard-en_GB.ts \
localization/rssguard-en_US.ts \
localization/rssguard-fr_FR.ts \
localization/rssguard-he_IL.ts \
localization/rssguard-id_ID.ts \
localization/rssguard-it_IT.ts \
localization/rssguard-ja_JP.ts \
localization/rssguard-lt_LT.ts \
localization/rssguard-nl_NL.ts \
localization/rssguard-pt_BR.ts \
localization/rssguard-sv_SE.ts
localization/rssguard-en.ts \
localization/rssguard-fr.ts \
localization/rssguard-he.ts \
localization/rssguard-id.ts \
localization/rssguard-it.ts \
localization/rssguard-ja.ts \
localization/rssguard-lt.ts \
localization/rssguard-nl.ts \
localization/rssguard-pt.ts \
localization/rssguard-sv.ts
TRANSLATIONS_WO_QT += $$PWD/localization/rssguard-cs_CZ.ts \
$$PWD/localization/rssguard-da_DK.ts \
$$PWD/localization/rssguard-de_DE.ts \
TRANSLATIONS_WO_QT += $$PWD/localization/rssguard-cs.ts \
$$PWD/localization/rssguard-da.ts \
$$PWD/localization/rssguard-de.ts \
$$PWD/localization/rssguard-en_GB.ts \
$$PWD/localization/rssguard-en_US.ts \
$$PWD/localization/rssguard-fr_FR.ts \
$$PWD/localization/rssguard-he_IL.ts \
$$PWD/localization/rssguard-id_ID.ts \
$$PWD/localization/rssguard-it_IT.ts \
$$PWD/localization/rssguard-ja_JP.ts \
$$PWD/localization/rssguard-lt_LT.ts \
$$PWD/localization/rssguard-nl_NL.ts \
$$PWD/localization/rssguard-pt_BR.ts \
$$PWD/localization/rssguard-sv_SE.ts
$$PWD/localization/rssguard-en.ts \
$$PWD/localization/rssguard-fr.ts \
$$PWD/localization/rssguard-he.ts \
$$PWD/localization/rssguard-id.ts \
$$PWD/localization/rssguard-it.ts \
$$PWD/localization/rssguard-ja.ts \
$$PWD/localization/rssguard-lt.ts \
$$PWD/localization/rssguard-nl.ts \
$$PWD/localization/rssguard-pt.ts \
$$PWD/localization/rssguard-sv.ts
INCLUDEPATH += $$PWD/. \
$$PWD/src \