Commit 3bbe911e authored by Yuri Chornoivan's avatar Yuri Chornoivan
Browse files

Use URLs with transport encryption

parent 59d01115
......@@ -96,7 +96,7 @@ add_definitions(
#include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} libscience)
if(MSVC)
# for correctly linking openbabel:
# see http://www.mail-archive.com/openbabel-devel@lists.sourceforge.net/msg01975.html
# see https://www.mail-archive.com/openbabel-devel@lists.sourceforge.net/msg01975.html
add_definitions(-DUSING_DYNAMIC_LIBS)
endif(MSVC)
......
......@@ -25,7 +25,7 @@ KAboutData kalziumGLPartAboutData()
ki18n("A cool thing"),
KAboutLicense::GPL, ki18n("(c) 2006, Carsten Niehaus"),
KLocalizedString(),
"http://edu.kde.org/kalzium/index.php"
"https://edu.kde.org/kalzium/"
);
aboutData.addAuthor(ki18n("Carsten Niehaus"), KLocalizedString(), "cniehaus@kde.org");
aboutData.addAuthor(ki18n("Marcus D. Hanwell"), KLocalizedString(), "marcus@cryos.org");
......
......@@ -323,7 +323,7 @@
</sect2>
<sect2 id="infodialog_extra">
<title>Extra Information</title>
<para>The <guilabel>Extra information</guilabel> page gives you the links to the element pages on Wikipedia, <ulink url="http://education.jlab.org/">Jefferson Lab</ulink>, and <ulink url="http://www.webelements.com/">WebElements</ulink>.</para>
<para>The <guilabel>Extra information</guilabel> page gives you the links to the element pages on Wikipedia, <ulink url="https://education.jlab.org/">Jefferson Lab</ulink>, and <ulink url="https://www.webelements.com/">WebElements</ulink>.</para>
<screenshot>
<screeninfo>&kalzium; information dialog</screeninfo>
<mediaobject>
......@@ -464,25 +464,25 @@
<itemizedlist>
<listitem><para>None: Do not use gradients.
</para></listitem>
<listitem><para><ulink url="http://en.wikipedia.org/wiki/State_of_matter">State of matter</ulink>&nbsp;
<listitem><para><ulink url="https://en.wikipedia.org/wiki/State_of_matter">State of matter</ulink>&nbsp;
</para></listitem>
<listitem><para><ulink url="http://en.wikipedia.org/wiki/Covalent_Radius">Covalent Radius</ulink>&nbsp;
<listitem><para><ulink url="https://en.wikipedia.org/wiki/Covalent_Radius">Covalent Radius</ulink>&nbsp;
</para></listitem>
<listitem><para><ulink url="http://en.wikipedia.org/wiki/Van_der_Waals_radius">van der Waals</ulink>: gradient by van der Waals radius
<listitem><para><ulink url="https://en.wikipedia.org/wiki/Van_der_Waals_radius">van der Waals</ulink>: gradient by van der Waals radius
</para></listitem>
<listitem><para><ulink url="http://en.wikipedia.org/wiki/Atomic_Mass">Atomic Mass</ulink>&nbsp;
<listitem><para><ulink url="https://en.wikipedia.org/wiki/Atomic_Mass">Atomic Mass</ulink>&nbsp;
</para></listitem>
<listitem><para><ulink url="http://en.wikipedia.org/wiki/Boiling_Point">Boiling Point</ulink>&nbsp;
<listitem><para><ulink url="https://en.wikipedia.org/wiki/Boiling_Point">Boiling Point</ulink>&nbsp;
</para></listitem>
<listitem><para><ulink url="http://en.wikipedia.org/wiki/Melting_Point">Melting Point</ulink>&nbsp;
<listitem><para><ulink url="https://en.wikipedia.org/wiki/Melting_Point">Melting Point</ulink>&nbsp;
</para></listitem>
<listitem><para><ulink url="http://en.wikipedia.org/wiki/Electronegativity">Electronegativity (Pauling)</ulink>&nbsp;
<listitem><para><ulink url="https://en.wikipedia.org/wiki/Electronegativity">Electronegativity (Pauling)</ulink>&nbsp;
</para></listitem>
<listitem><para><ulink url="http://en.wikipedia.org/wiki/Electron_affinity">Electronaffinity</ulink>&nbsp;
<listitem><para><ulink url="https://en.wikipedia.org/wiki/Electron_affinity">Electronaffinity</ulink>&nbsp;
</para></listitem>
<listitem><para>Discovery date
</para></listitem>
<listitem><para><ulink url="http://en.wikipedia.org/wiki/Ionization_energy">First Ionization</ulink>&nbsp;
<listitem><para><ulink url="https://en.wikipedia.org/wiki/Ionization_energy">First Ionization</ulink>&nbsp;
</para></listitem>
</itemizedlist>
</sect1>
......@@ -985,7 +985,7 @@
<guimenu>File</guimenu>
<guimenuitem>Convert chemical files...</guimenuitem>
</menuchoice></term>
<listitem><para><action>Open</action> a dialog to import and export a wide range of chemical file formats and data types with the <ulink url="http://openbabel.org/wiki/Main_Page">Open Babel library</ulink>.</para></listitem>
<listitem><para><action>Open</action> a dialog to import and export a wide range of chemical file formats and data types with the <ulink url="https://openbabel.org/wiki/Main_Page">Open Babel library</ulink>.</para></listitem>
</varlistentry>
<varlistentry>
<term><menuchoice>
......@@ -1321,7 +1321,7 @@ of the &kde; Fundamentals.
<answer>
<para>No, never. But the author always welcomes a nice mail or a
DVD as a <quote>Thank You</quote>. &kalzium; is licensed
under the <ulink url="http://www.gnu.org/licenses/licenses.html#GPL">GPL</ulink>, so you will never have to pay for this program.</para>
under the <ulink url="https://www.gnu.org/licenses/licenses.html#GPL">GPL</ulink>, so you will never have to pay for this program.</para>
</answer>
</qandaentry>
......
......@@ -101,9 +101,9 @@
<p xml:lang="x-test">xxKalzium is a program that shows you the Periodic Table of Elements. You can use Kalzium to search for information about the elements or to learn facts about the periodic table. It provides an overview of the important data (like melting points, electron affinity, electron negativity, electron configuration, radii, mass, ionisation energy), an isotope table, and different colored views of the periodic table (separation of the different blocks, year simulator, temperature simulator). It contains tools to visualize the spectral lines of each element, a molecular weight calculator, a 3D molecule editor, and an equation solver for stoichiometric problems.xx</p>
<p xml:lang="zh-TW">Kalzium 是一套元素週期表的應用程式。您可以用 Kalzium 搜尋關於元素的資訊與知識。它提供了元素重要資料的概要(如熔點、電子親合力、電負性、電子結構、凡德瓦半徑、質量、游離能等等),元素的同位素表,還有週期表上的不同表達方式(如發現時間、溫度狀態等等)。它也包含了一些視覺化的工具,莫耳質量計算器,立體分子編輯器,以及方程式計算器等功能。</p>
</description>
<url type="homepage">http://edu.kde.org/kalzium/</url>
<url type="homepage">https://edu.kde.org/kalzium/</url>
<url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=kalzium</url>
<url type="help">http://docs.kde.org/stable/en/kdeedu/kalzium/</url>
<url type="help">https://docs.kde.org/stable/en/kdeedu/kalzium/</url>
<url type="donation">https://www.kde.org/community/donations/?app=kalzium&amp;source=appdata</url>
<screenshots>
<screenshot type="default">
......@@ -130,7 +130,7 @@
<caption xml:lang="x-test">xxPeriodic table of elements view in Kalziumxx</caption>
<caption xml:lang="zh-CN">Kalzium 中的元素周期表视图</caption>
<caption xml:lang="zh-TW">在 Kalzium 觀看元素週期表</caption>
<image>http://kde.org/images/screenshots/kalzium.png</image>
<image>https://kde.org/images/screenshots/kalzium.png</image>
</screenshot>
</screenshots>
<project_group>KDE</project_group>
......
......@@ -109,7 +109,7 @@ X-KDE-PluginInfo-Author=Carsten Niehaus
X-KDE-PluginInfo-Email=cniehaus@kde.org
X-KDE-PluginInfo-Name=plasma_applet_data_kalzium
X-KDE-PluginInfo-Version=0.1
X-KDE-PluginInfo-Website=http://edu.kde.org/kalzium/
X-KDE-PluginInfo-Website=https://edu.kde.org/kalzium/
X-KDE-PluginInfo-Category=Education
X-KDE-PluginInfo-Depends=
X-KDE-PluginInfo-License=GPL
......
......@@ -95,7 +95,7 @@ X-KDE-PluginInfo-Author=Kashyap R Puranik
X-KDE-PluginInfo-Email=kashthealien@gmail.com
X-KDE-PluginInfo-Name=concentrationCalculator
X-KDE-PluginInfo-Version=0.1
X-KDE-PluginInfo-Website=http://plasma.kde.org/
X-KDE-PluginInfo-Website=https://kde.org/plasma-desktop
X-KDE-PluginInfo-Category=Education
X-KDE-PluginInfo-Depends=
X-KDE-PluginInfo-License=GPL
......
......@@ -111,7 +111,7 @@ X-KDE-PluginInfo-Author=Carsten Niehaus
X-KDE-PluginInfo-Email=cniehaus@kde.org
X-KDE-PluginInfo-Name=plasma_applet_didyouknow_kalzium
X-KDE-PluginInfo-Version=0.1
X-KDE-PluginInfo-Website=http://edu.kde.org/kalzium/
X-KDE-PluginInfo-Website=https://edu.kde.org/kalzium/
X-KDE-PluginInfo-Category=Education
X-KDE-PluginInfo-Depends=
X-KDE-PluginInfo-License=GPL
......
......@@ -97,7 +97,7 @@ X-KDE-PluginInfo-Author=Kashyap R Puranik
X-KDE-PluginInfo-Email=kashthealien@gmail.com
X-KDE-PluginInfo-Name=gasCalculator
X-KDE-PluginInfo-Version=0.1
X-KDE-PluginInfo-Website=http://plasma.kde.org/
X-KDE-PluginInfo-Website=https://kde.org/plasma-desktop
X-KDE-PluginInfo-Category=Education
X-KDE-PluginInfo-Depends=
X-KDE-PluginInfo-License=GPL
......
......@@ -95,7 +95,7 @@ X-KDE-PluginInfo-Author=Kashyap R Puranik
X-KDE-PluginInfo-Email=kashthealien@gmail.com
X-KDE-PluginInfo-Name=nuclearCalculator
X-KDE-PluginInfo-Version=0.1
X-KDE-PluginInfo-Website=http://plasma.kde.org/
X-KDE-PluginInfo-Website=https://kde.org/plasma-desktop
X-KDE-PluginInfo-Category=Education
X-KDE-PluginInfo-Depends=
X-KDE-PluginInfo-License=GPL
......
......@@ -95,7 +95,7 @@ X-KDE-PluginInfo-Author=Etienne Rebetez
X-KDE-PluginInfo-Email=etienne.rebetez@oberwallis.ch
X-KDE-PluginInfo-Name=MolmassCalculator
X-KDE-PluginInfo-Version=0.4.2
X-KDE-PluginInfo-Website=http://plasma.kde.org/
X-KDE-PluginInfo-Website=https://kde.org/plasma-desktop
X-KDE-PluginInfo-Category=Science
X-KDE-PluginInfo-Depends=
X-KDE-PluginInfo-License=GPL
......
......@@ -273,7 +273,7 @@ QString DetailedInfoDlg::getHtml(DATATYPE type)
html.append (createWikiLink(m_element->dataAsString(ChemicalDataObject::name), i18nc("Link to element's Wikipedia page, %1 is localized language name", "Wikipedia (%1)", QLocale().nativeLanguageName())));
html.append ("</td></tr>");
//http://education.jlab.org/itselemental/ele001.html
//https://education.jlab.org/itselemental/ele001.html
html.append ("<tr><td>");
html.append ("<a href=\"https://"); // https://
html.append ("education.jlab.org/itselemental/ele");
......
......@@ -116,7 +116,7 @@ private:
/**
* Creates a localized link to Wikipedia.
* http://en.wikipedia.org/wiki/link"
* https://en.wikipedia.org/wiki/link"
* @param link the link inside wikipedia
* @param displayString the displayed string to click on.
*/
......
[KNewStuff3]
ProvidersUrl=http://data.kstuff.org/cgi-bin/hotstuff-provider?site=kalzium
ProvidersUrl=https://data.kstuff.org/cgi-bin/hotstuff-provider?site=kalzium
TargetDir=kalzium/molecules/
Uncompress=never
......@@ -12,7 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "kalziumunitcombobox.h"
......
......@@ -12,7 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef KALZIUMUNITCOMBOBOX_H
......
......@@ -51,7 +51,7 @@ int main(int argc, char **argv)
KAboutLicense::GPL,
i18n("(C) 2002-2016 Carsten Niehaus & the KDE Edu Developers"),
QString(),
QStringLiteral("http://edu.kde.org/kalzium"));
QStringLiteral("https://edu.kde.org/kalzium"));
about.addAuthor(i18n("Carsten Niehaus"),
QString(),
......
......@@ -13,7 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "periodictablestates.h"
......
......@@ -12,7 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef PERIODICTABLESTATES_H
......
This diff is collapsed.
......@@ -12,7 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "unitsettingsdialog.h"
......
......@@ -13,7 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef UNITSETTINGSDIALOG_H
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment