root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 03:35:53 +01:00
Code Issues Projects Releases Activity

Compare commits

base: root:e33c74bdd76e2637cc77039f922c28ba4ff09b18
Branches Tags
root:master
root:gh-pages
root:13.31
root:13.30
root:13.29
root:13.28
root:13.27
root:13.26
root:13.25
root:13.24
root:13.23
root:13.22
root:13.21
root:13.20
root:13.19
root:13.18
root:13.17
root:13.16
root:13.15
root:13.14
root:13.13
root:13.12
root:13.11
root:13.10
root:13.9
root:13.8
root:13.7
root:13.6
root:13.5
root:13.4
root:13.3
root:13.2
root:13.1
root:13.0
root:12.4
root:12.3
root:12.2
root:12.1
root:12.0
root:11.12
root:11.11
root:11.10
root:11.9
root:11.8
root:11.7
root:11.6
root:11.5
root:11.4
root:11.3
root:11.2
root:11.1
root:11.0
root:10.7
root:10.6
root:10.5
root:10.4
root:10.3
root:10.2
root:10.1
root:10.0
root:9.12
root:9.11
root:9.10
root:9.9
root:9.8
root:9.7
root:9.6
root:9.5
root:9.4
root:9.3
root:9.2
root:9.1
root:9.0
root:8.9
root:8.8
root:8.7
root:8.6
root:8.5
root:8.4
root:8.3
root:8.2
root:8.1
root:8.0
root:7.38
root:7.37
root:7.36
root:7.35
root:7.34
root:7.33
root:7.32
root:7.31
root:7.30
root:7.29
root:7.28
root:7.27
root:7.26
root:7.25
root:7.24
root:7.23
root:7.22
root:7.21
root:7.20
root:7.19
root:7.18
root:7.17
root:7.16
root:7.15
root:7.14
root:7.13
root:7.12
root:7.11
root:7.10
root:7.9
root:7.8
root:7.7
root:7.6
root:7.5
root:7.4
root:7.3
root:7.2
root:7.1
root:7.0
root:6.3
root:6.2
root:6.1
root:6.0
root:5.18
root:5.17
root:5.16
root:5.15
root:5.14
root:5.13
root:5.12
root:5.11
root:5.10
root:5.9
root:5.8
root:5.7
root:5.6
root:5.5
root:5.4
root:5.3
root:5.2
root:5.1
root:5.0
root:4.19
root:4.18
root:4.17
root:4.16
root:4.15
root:4.14
root:4.13
root:4.12
root:4.11
root:4.10
root:4.9
root:4.8
root:4.7
root:4.6
root:4.5
root:4.4
root:4.3
root:4.2
root:4.1
root:4.0
root:3.10
root:3.9
root:3.8
root:3.7
root:3.6
root:3.5
root:3.4
root:3.3
root:3.2
root:3.1
root:3.0
root:2.20
root:2.19
root:2.18
root:2.17
root:2.16
root:2.15
root:2.14
root:2.13
root:2.12
root:2.11
root:2.10
root:2.9
root:2.8
root:2.7
root:2.6
root:2.5
root:2.4
root:2.3
root:2.2
root:2.1
root:2.0
root:1.1
root:1.0
..
compare: root:d328eecad68d9860cea6567ae19510d6b8d9d535
Branches Tags
root:master
root:gh-pages
root:13.31
root:13.30
root:13.29
root:13.28
root:13.27
root:13.26
root:13.25
root:13.24
root:13.23
root:13.22
root:13.21
root:13.20
root:13.19
root:13.18
root:13.17
root:13.16
root:13.15
root:13.14
root:13.13
root:13.12
root:13.11
root:13.10
root:13.9
root:13.8
root:13.7
root:13.6
root:13.5
root:13.4
root:13.3
root:13.2
root:13.1
root:13.0
root:12.4
root:12.3
root:12.2
root:12.1
root:12.0
root:11.12
root:11.11
root:11.10
root:11.9
root:11.8
root:11.7
root:11.6
root:11.5
root:11.4
root:11.3
root:11.2
root:11.1
root:11.0
root:10.7
root:10.6
root:10.5
root:10.4
root:10.3
root:10.2
root:10.1
root:10.0
root:9.12
root:9.11
root:9.10
root:9.9
root:9.8
root:9.7
root:9.6
root:9.5
root:9.4
root:9.3
root:9.2
root:9.1
root:9.0
root:8.9
root:8.8
root:8.7
root:8.6
root:8.5
root:8.4
root:8.3
root:8.2
root:8.1
root:8.0
root:7.38
root:7.37
root:7.36
root:7.35
root:7.34
root:7.33
root:7.32
root:7.31
root:7.30
root:7.29
root:7.28
root:7.27
root:7.26
root:7.25
root:7.24
root:7.23
root:7.22
root:7.21
root:7.20
root:7.19
root:7.18
root:7.17
root:7.16
root:7.15
root:7.14
root:7.13
root:7.12
root:7.11
root:7.10
root:7.9
root:7.8
root:7.7
root:7.6
root:7.5
root:7.4
root:7.3
root:7.2
root:7.1
root:7.0
root:6.3
root:6.2
root:6.1
root:6.0
root:5.18
root:5.17
root:5.16
root:5.15
root:5.14
root:5.13
root:5.12
root:5.11
root:5.10
root:5.9
root:5.8
root:5.7
root:5.6
root:5.5
root:5.4
root:5.3
root:5.2
root:5.1
root:5.0
root:4.19
root:4.18
root:4.17
root:4.16
root:4.15
root:4.14
root:4.13
root:4.12
root:4.11
root:4.10
root:4.9
root:4.8
root:4.7
root:4.6
root:4.5
root:4.4
root:4.3
root:4.2
root:4.1
root:4.0
root:3.10
root:3.9
root:3.8
root:3.7
root:3.6
root:3.5
root:3.4
root:3.3
root:3.2
root:3.1
root:3.0
root:2.20
root:2.19
root:2.18
root:2.17
root:2.16
root:2.15
root:2.14
root:2.13
root:2.12
root:2.11
root:2.10
root:2.9
root:2.8
root:2.7
root:2.6
root:2.5
root:2.4
root:2.3
root:2.2
root:2.1
root:2.0
root:1.1
root:1.0

No commits in common. "e33c74bdd76e2637cc77039f922c28ba4ff09b18" and "d328eecad68d9860cea6567ae19510d6b8d9d535" have entirely different histories.
e33c74bdd7 ... d328eecad6

8 changed files with 16 additions and 15 deletions
Show Stats Expand all files Collapse all files

4
lang/gpxsee_ca.ts
View File

@ -2305,7 +2305,7 @@
<message> <message>
<location filename="../src/GUI/routeitem.cpp" line="38"/> <location filename="../src/GUI/routeitem.cpp" line="38"/>
<source>File</source> <source>File</source>
<translation>Fitxer</translation> <translation type="unfinished">Fitxer</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2571,7 +2571,7 @@
<message> <message>
<location filename="../src/GUI/trackitem.cpp" line="46"/> <location filename="../src/GUI/trackitem.cpp" line="46"/>
<source>File</source> <source>File</source>
<translation>Fitxer</translation> <translation type="unfinished">Fitxer</translation>
</message> </message>
</context> </context>
<context> <context>

4
lang/gpxsee_fr.ts
View File

@ -2305,7 +2305,7 @@
<message> <message>
<location filename="../src/GUI/routeitem.cpp" line="38"/> <location filename="../src/GUI/routeitem.cpp" line="38"/>
<source>File</source> <source>File</source>
<translation>Fichier</translation> <translation type="unfinished">Fichier</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2571,7 +2571,7 @@
<message> <message>
<location filename="../src/GUI/trackitem.cpp" line="46"/> <location filename="../src/GUI/trackitem.cpp" line="46"/>
<source>File</source> <source>File</source>
<translation>Fichier</translation> <translation type="unfinished">Fichier</translation>
</message> </message>
</context> </context>
<context> <context>

4
lang/gpxsee_hu.ts
View File

@ -2303,7 +2303,7 @@
<message> <message>
<location filename="../src/GUI/routeitem.cpp" line="38"/> <location filename="../src/GUI/routeitem.cpp" line="38"/>
<source>File</source> <source>File</source>
<translation>Műveletgombok</translation> <translation type="unfinished">Műveletgombok</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2569,7 +2569,7 @@
<message> <message>
<location filename="../src/GUI/trackitem.cpp" line="46"/> <location filename="../src/GUI/trackitem.cpp" line="46"/>
<source>File</source> <source>File</source>
<translation>Műveletgombok</translation> <translation type="unfinished">Műveletgombok</translation>
</message> </message>
</context> </context>
<context> <context>

4
lang/gpxsee_ko.ts
View File

@ -2303,7 +2303,7 @@
<message> <message>
<location filename="../src/GUI/routeitem.cpp" line="38"/> <location filename="../src/GUI/routeitem.cpp" line="38"/>
<source>File</source> <source>File</source>
<translation>파일</translation> <translation type="unfinished">파일</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2569,7 +2569,7 @@
<message> <message>
<location filename="../src/GUI/trackitem.cpp" line="46"/> <location filename="../src/GUI/trackitem.cpp" line="46"/>
<source>File</source> <source>File</source>
<translation>파일</translation> <translation type="unfinished">파일</translation>
</message> </message>
</context> </context>
<context> <context>

4
lang/gpxsee_nb.ts
View File

@ -2305,7 +2305,7 @@
<message> <message>
<location filename="../src/GUI/routeitem.cpp" line="38"/> <location filename="../src/GUI/routeitem.cpp" line="38"/>
<source>File</source> <source>File</source>
<translation>Fil</translation> <translation type="unfinished">Fil</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2571,7 +2571,7 @@
<message> <message>
<location filename="../src/GUI/trackitem.cpp" line="46"/> <location filename="../src/GUI/trackitem.cpp" line="46"/>
<source>File</source> <source>File</source>
<translation>Fil</translation> <translation type="unfinished">Fil</translation>
</message> </message>
</context> </context>
<context> <context>

4
lang/gpxsee_sv.ts
View File

@ -2305,7 +2305,7 @@
<message> <message>
<location filename="../src/GUI/routeitem.cpp" line="38"/> <location filename="../src/GUI/routeitem.cpp" line="38"/>
<source>File</source> <source>File</source>
<translation>Arkiv</translation> <translation type="unfinished">Arkiv</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2571,7 +2571,7 @@
<message> <message>
<location filename="../src/GUI/trackitem.cpp" line="46"/> <location filename="../src/GUI/trackitem.cpp" line="46"/>
<source>File</source> <source>File</source>
<translation>Arkiv</translation> <translation type="unfinished">Arkiv</translation>
</message> </message>
</context> </context>
<context> <context>

4
lang/gpxsee_zh.ts
View File

@ -2303,7 +2303,7 @@
<message> <message>
<location filename="../src/GUI/routeitem.cpp" line="38"/> <location filename="../src/GUI/routeitem.cpp" line="38"/>
<source>File</source> <source>File</source>
<translation>文件</translation> <translation type="unfinished">文件</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2569,7 +2569,7 @@
<message> <message>
<location filename="../src/GUI/trackitem.cpp" line="46"/> <location filename="../src/GUI/trackitem.cpp" line="46"/>
<source>File</source> <source>File</source>
<translation>文件</translation> <translation type="unfinished">文件</translation>
</message> </message>
</context> </context>
<context> <context>

3
src/GUI/optionsdialog.cpp
View File

@ -529,9 +529,10 @@ QWidget *OptionsDialog::createDataPage()
sourceTab->setLayout(sourceTabLayout); sourceTab->setLayout(sourceTabLayout);
#endif // Q_OS_MAC #endif // Q_OS_MAC
QVBoxLayout *pauseTypeLayout = new QVBoxLayout(); QHBoxLayout *pauseTypeLayout = new QHBoxLayout();
pauseTypeLayout->addWidget(_automaticPause); pauseTypeLayout->addWidget(_automaticPause);
pauseTypeLayout->addWidget(_manualPause); pauseTypeLayout->addWidget(_manualPause);
pauseTypeLayout->addStretch();
QFormLayout *pauseValuesLayout = new QFormLayout(); QFormLayout *pauseValuesLayout = new QFormLayout();
pauseValuesLayout->addRow(tr("Detection:"), pauseTypeLayout); pauseValuesLayout->addRow(tr("Detection:"), pauseTypeLayout);