l10n daemon script
f5037a42d8
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2022-03-25 01:46:05 +00:00
l10n daemon script
662058bea4
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2022-03-17 01:46:52 +00:00
l10n daemon script
5b314846fe
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2022-02-20 01:45:04 +00:00
l10n daemon script
33db3d3dc2
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2022-02-18 01:48:51 +00:00
l10n daemon script
b2c80f27ac
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2022-02-15 01:47:16 +00:00
Alexander Lohnau
e365e1b35c
Port from KPluginSelector to new KPluginWidget class
...
Task: https://phabricator.kde.org/T12265
2021-12-15 08:24:22 +01:00
Alexander Lohnau
fd681e62ab
Port deprecated KCMultiDialog methods & embed json metadata in KCM
...
This KCM will have to get installed installed in the new plasma namespace eventually.
But considering that this app is part of the release service, we should not
depend on changes in a not yet released Plasma version.
Task: https://phabricator.kde.org/T14501
2021-12-15 08:24:22 +01:00
ivan tkachenko
9302a2b3be
[KCM] Fix layout: stretch left VBox without margins
...
Default margins are non-zero for widgets/layouts. Thus, nested widgets
are gonna shrink further and further inward for no good reason.
This patch makes left column of this KCM (the host name, devices list
view and a Refresh button) visually aligned with the QGroupBox on the
right.
2021-12-08 02:56:05 +03:00
Kai Uwe Broulik
14633d4486
[KCM] Squeeze key and make it selectable by mouse
...
Avoids it blowing up the layout
2021-12-01 11:26:53 +00:00
l10n daemon script
034e5fb03c
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2021-11-29 01:34:49 +00:00
l10n daemon script
5c76528250
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2021-11-24 01:36:30 +00:00
l10n daemon script
ff40955e2c
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2021-11-16 01:23:36 +00:00
l10n daemon script
6fe9953f74
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2021-11-13 01:25:12 +00:00
l10n daemon script
03371d054c
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2021-11-02 01:13:44 +00:00
l10n daemon script
0ce60e9230
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2021-10-15 01:14:37 +00:00
Matt Alexander
f596972bcb
Update help link to reference a page that helps with connectivity problems. The one that was currently used was mostly concerned with project development.
2021-10-12 08:06:04 +00:00
l10n daemon script
61b2e607b4
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2021-09-26 01:12:22 +00:00
l10n daemon script
a3792aa75f
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2021-09-20 01:22:57 +00:00
l10n daemon script
47c34f8023
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2021-09-19 01:24:32 +00:00
l10n daemon script
9d5dcc9915
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2021-09-15 01:21:17 +00:00
l10n daemon script
977c58dcf8
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2021-09-14 01:21:55 +00:00
l10n daemon script
bcf79a5235
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2021-09-13 01:16:46 +00:00
l10n daemon script
634be9a254
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2021-09-12 01:17:16 +00:00
l10n daemon script
db697c5692
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2021-09-11 01:15:16 +00:00
l10n daemon script
dd569389f7
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2021-09-10 01:17:24 +00:00
l10n daemon script
d09dae15a7
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2021-09-09 01:16:59 +00:00
Guilherme Marçal Silva
3022c173f2
Add 'share' keyword
2021-09-08 00:29:55 +00:00
Guilherme Marçal Silva
98a7eb220b
Add keywords to KDEConnect KCM to improve search
2021-09-07 18:51:48 +00:00
Piyush Aggarwal
82c7a8080d
add KColorSchemeManager instance to install auto dark theme on Windows
2021-06-13 13:51:28 +05:30
Piyush Aggarwal
7f7f0d8992
ensure kiconloader is instantiated when bringing up settings
2021-06-11 23:45:14 +05:30
Piyush Aggarwal
02ed0699ff
set app style to breeze explicitly on Windows
2021-06-03 03:15:35 +05:30
l10n daemon script
f4211e0431
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2021-04-22 01:12:28 +00:00
l10n daemon script
a558af4dd3
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2021-01-16 06:40:31 +01:00
l10n daemon script
38afb807bf
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-12-07 06:11:38 +01:00
l10n daemon script
6a0d2974f2
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-11-28 06:26:40 +01:00
Albert Vaca Cintora
e7518493df
Add a verification key that's displayed when pairing
...
The key is a sha256 of both devices' certificates. Both should generate the
same key, so hey user can check they are pairing against the right device.
Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
2020-11-26 11:28:49 +01:00
Nicolas Fella
8b82a30d40
CMake cleanup
...
Remove all include_directory calls
They are either unnecessary or can be done better
2020-11-16 12:21:07 +00:00
l10n daemon script
0f6aab8747
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-11-14 06:37:40 +01:00
l10n daemon script
220317c778
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-11-11 06:53:02 +01:00
Nicolas Fella
f2d97193eb
Remove defunct calls to KAboutData::pluginData
...
The data is never registered so they always return nullptr. We might as well not pass it.
2020-10-31 19:58:05 +00:00
Alexander Lohnau
9d94c25d83
Use systemsettings5 instead of kcmshell5
...
CCBUG: 398803
2020-10-24 15:25:57 +02:00
l10n daemon script
e57fd79f26
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-09-19 06:10:24 +02:00
l10n daemon script
b7bdc75ff9
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-09-17 06:15:05 +02:00
Nicolas Fella
87db95b22f
Convert license headers to SPDX expressions
2020-08-17 09:48:10 +00:00
l10n daemon script
90a3ded076
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-08-09 05:37:05 +02:00
l10n daemon script
10de7b3763
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-07-23 09:50:37 +02:00
l10n daemon script
0c32010a28
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-07-06 05:30:08 +02:00
Nicolas Fella
c8a87db367
Merge branch 'release/20.04'
2020-07-05 15:49:58 +02:00
l10n daemon script
e44e4a4c19
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-06-20 05:10:40 +02:00
l10n daemon script
373557cd26
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-06-18 08:27:38 +02:00
l10n daemon script
653a708727
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-06-18 05:39:20 +02:00
l10n daemon script
5fe8d7ea90
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-06-17 16:50:11 +02:00
l10n daemon script
e873eddcde
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-06-17 14:06:59 +02:00
l10n daemon script
046a572542
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-06-07 08:58:38 +02:00
l10n daemon script
f98953380f
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-05-31 20:22:34 +02:00
l10n daemon script
bc08ff79e6
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-05-31 14:20:49 +02:00
l10n daemon script
baf52b49ac
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-04-08 11:04:09 +02:00
l10n daemon script
43ea8052fe
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-04-08 06:32:15 +02:00
l10n daemon script
1634126eb5
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-04-07 10:16:35 +02:00
l10n daemon script
0e04769a43
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-04-07 06:11:40 +02:00
l10n daemon script
87d58643a2
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-03-17 10:05:04 +01:00
l10n daemon script
201be5d898
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-03-16 10:21:09 +01:00
l10n daemon script
7eee223dfc
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-03-02 05:46:53 +01:00
Nicolas Fella
1a2315cdf7
Move settings app into own folder and make it a KDBusService
2020-01-17 01:32:56 +01:00
l10n daemon script
cb307e16b2
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-11-17 05:06:27 +01:00
Nate Graham
5fd0d2327b
Use more appropriate icon that's colorful at small sizes
...
The current icon does not follow the recommended pattern of using preferences- icons
and has a small version that's monochrome, causing the sidebar in System Settings to
inappropriately display some small monochrome icons.
Ref T10165
2019-09-10 14:15:01 -06:00
l10n daemon script
392d287b64
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-08-11 04:47:22 +02:00
l10n daemon script
5427754e21
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-08-01 04:51:32 +02:00
l10n daemon script
e4e4c58b60
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-07-31 05:10:13 +02:00
l10n daemon script
c53108bb25
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-07-08 04:56:21 +02:00
l10n daemon script
3d0acf15a5
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-06-27 05:13:07 +02:00
Nicolas Fella
e601755644
Force usage of QStringLiteral and port remaining offenders
2019-06-10 14:40:28 +00:00
Nicolas Fella
3b8fedea1a
Replace http GNU urls with https
2019-03-23 17:29:26 +01:00
Nicolas Fella
1f1462e813
Remove unused includes
2019-02-28 14:11:23 +01:00
Nicolas Fella
fc4da13d64
Add context object
2019-02-28 14:08:17 +01:00
l10n daemon script
1d3368532a
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-02-26 05:29:15 +01:00
l10n daemon script
41e13c2e84
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-01-31 05:44:46 +01:00
l10n daemon script
71c5a1b248
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-01-06 05:29:27 +01:00
Nicolas Fella
d26d2ada78
Don't use kcmshell5 for opening the KCM
...
Summary:
kcmshell5 depends on plasma-workspace. By using our own tiny wrapper for opening the KCM we avoid pulling
in plasma-workspace and everything that comes with it on non-Plasma systems.
Test Plan: kdeconnect-settings shows the KCM
Reviewers: #kde_connect, sredman
Reviewed By: #kde_connect, sredman
Subscribers: sredman, kdeconnect
Tags: #kde_connect
Differential Revision: https://phabricator.kde.org/D17383
2018-12-06 23:10:05 +01:00
l10n daemon script
283211b4eb
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-10-10 06:19:16 +02:00
l10n daemon script
e40312bf5e
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-06-18 05:27:46 +02:00
Nicolas Fella
68d0c5d143
Do not require Frameworks 5.45
...
Summary: Ifdef for old KF5 as discussed in D11684.
Test Plan: Can still use feature when above 5.45
Reviewers: apol
Reviewed By: apol
Subscribers: kdeconnect
Tags: #kde_connect
Differential Revision: https://phabricator.kde.org/D12810
2018-05-10 19:48:40 +02:00
Aleix Pol
dd031d3deb
Show the KCM with the run commands open when a setup packet is received
...
Summary: Depends on D11683.
Test Plan: Tested the `kcmshell kdeconnect --args mydeviceid:kdeconnect_runcommand` works
Reviewers: #kde_connect, nicolasfella
Reviewed By: #kde_connect, nicolasfella
Subscribers: nicolasfella
Tags: #kde_connect
Differential Revision: https://phabricator.kde.org/D11684
2018-04-19 03:03:42 +02:00
Friedrich W. H. Kossebau
0c560d9062
Fix ui file hint: KMessageWidget extends QFrame in KF5 times
2018-03-22 17:34:54 +01:00
Friedrich W. H. Kossebau
bb3ab8b631
Clean-up requirements: cmake 3.0, qt 5.7, use min versions, deduplicate KF5
...
Summary:
* cmake 2.8.12 is really outdated, 3.0 is minimum in plasma & kf5
* cmake_minimum_required should be at begin of toplevel CMakeLists.txt
* bump qt version to 5.7, matching the min Qt version of kf5 5.42
* with ecm being part of kf5 since early versions, share ${KF5_MIN_VERSION}
* use QT_MIN_VERSION & KF5_MIN_VERSION also for separate find_package calls
* deduplicate all KF5 components searched for in unconditionally included
subdirs
Test Plan: Still configures and builds with all options OFF & ON
Reviewers: #kde_connect, nicolasfella
Reviewed By: #kde_connect, nicolasfella
Subscribers: nicolasfella
Differential Revision: https://phabricator.kde.org/D11418
2018-03-17 23:34:33 +01:00
Albert Vaca
9aaebd1dd6
Use fallback text if icon is not found
...
BUG: 356484
2018-02-17 15:14:11 +01:00
Nicolas Fella
aeb4eeff73
Tweak KCM
...
Summary: Tweaking the text a little leads to a window size that doesn't cut off the refresh button when no device is selected.
Test Plan:
Before:
{F5691067}
After:
{F5691069}
Reviewers: #kde_connect, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: #kde_connect
Tags: #kde_connect
Differential Revision: https://phabricator.kde.org/D10287
2018-02-04 12:41:30 +01:00
l10n daemon script
ab006521f8
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-01-28 05:06:41 +01:00
l10n daemon script
057a114629
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-09-19 04:58:52 +02:00
Albert Vaca
84bba9429f
Merge branch 'master' into 1.x
...
# Conflicts:
# core/backends/lan/downloadjob.cpp
# core/backends/lan/downloadjob.h
# core/filetransferjob.cpp
# core/filetransferjob.h
# plugins/notifications/sendreplydialog.cpp
# plugins/notifications/sendreplydialog.h
# plugins/telephony/sendsmsdialog.cpp
# plugins/telephony/sendsmsdialog.h
2017-09-03 22:05:54 +02:00
Jean Vincent
72535ecf48
Make member variable names, & placement and * placement more coherent
...
Summary:
Change all member variables to the form m_fooBar because it is the preferred form in Qt (it was half and half between this and mFooBar, and a minority didn't have anything).
Place all references and pointers on the side of the type since it is the majority.
Basically:
- mFoo -> m_foo
- foo -> m_foo (if it is a member variable)
- Type &ref -> Type& ref
- Type *ptr -> Type* ptr
Reviewers: #kde_connect, nicolasfella, albertvaka
Reviewed By: #kde_connect, nicolasfella, albertvaka
Subscribers: albertvaka, #kde_connect
Tags: #kde_connect
Differential Revision: https://phabricator.kde.org/D7312
2017-09-03 21:45:08 +02:00
l10n daemon script
dadcc76841
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-08-06 06:02:06 +02:00
l10n daemon script
0356908fc8
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-08-06 04:42:32 +02:00
Albert Vaca
a18f91ccc1
Swapped labels
2017-08-02 02:59:41 +02:00
l10n daemon script
cc43a72884
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-07-14 05:43:50 +02:00
Aleix Pol
209e3e2842
Reflect property change when unpairing
...
There's no pairStatusChanged when the device is not connected to
anything (be it because it's unreachable at the moment).
2017-07-14 01:01:15 +02:00
Fabian Vogt
0667c6556f
Merge branch '1.x'
2017-07-12 11:37:41 +02:00
Fabian Vogt
5641d818dc
Treat device names as plaintext, not rich text
...
Summary:
Notifications, QML Text and QLabel accept a HTML subset,
which does not make sense for device names.
BUG: 382243
Test Plan:
Sent a pair request and accepted it, device name
now shown as plain text everywhere.
Reviewers: #kde_connect, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: #kde_connect
Differential Revision: https://phabricator.kde.org/D6640
2017-07-12 11:33:21 +02:00
l10n daemon script
ef1bee54e0
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-06-20 05:46:09 +02:00
l10n daemon script
36269e6506
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-06-20 04:26:54 +02:00