Commits · master · Plasma / Plasma Mobile

04 Feb, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 584b5a7e
  Script Kiddy authored Feb 04, 2023
  
  584b5a7e
- SVN_SILENT made messages (.desktop file) - always resolve ours · 9f420519
  Script Kiddy authored Feb 04, 2023
```
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"
```
  9f420519
02 Feb, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 0dca298c
  Script Kiddy authored Feb 02, 2023
  
  0dca298c
31 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · d69bda68
  Script Kiddy authored Jan 31, 2023
  
  d69bda68
30 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 6cbcf89d
  Script Kiddy authored Jan 30, 2023
  
  6cbcf89d
- SVN_SILENT made messages (.desktop file) - always resolve ours · 008a22b6
  Script Kiddy authored Jan 30, 2023
```
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"
```
  008a22b6
29 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · a4fd22a1
  Script Kiddy authored Jan 29, 2023
  
  a4fd22a1
- SVN_SILENT made messages (.desktop file) - always resolve ours · 9dbe4cd0
  Script Kiddy authored Jan 29, 2023
```
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"
```
  9dbe4cd0
28 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · ed8caf4c
  Script Kiddy authored Jan 28, 2023
  
  ed8caf4c
- SVN_SILENT made messages (.desktop file) - always resolve ours · 46ace5ee
  Script Kiddy authored Jan 28, 2023
```
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"
```
  46ace5ee
27 Jan, 2023 1 commit
- Update version number for 5.27.80 · d6ee45c2
  Jonathan Esk-Riddell authored Jan 27, 2023
```
GIT_SILENT
```
  d6ee45c2
25 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · e0e4b721
  Script Kiddy authored Jan 25, 2023
  
  e0e4b721
24 Jan, 2023 1 commit
- Revert "Show all headers in qtc6" · 750d5581
  David Redondo authored Jan 24, 2023
```
There was no consensus for this in Plasma.
This reverts commit c79ca828.
```
  750d5581
22 Jan, 2023 2 commits
- Show all headers in qtc6 · c79ca828
  Laurent Montel authored Jan 22, 2023
  
  c79ca828
- SVN_SILENT made messages (.desktop file) - always resolve ours · 45cdc532
  Script Kiddy authored Jan 22, 2023
```
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"
```
  45cdc532
21 Jan, 2023 2 commits
- Update kf5 version requirement to 5.102.0 · 326f11a4
  Jonathan Esk-Riddell authored Jan 21, 2023
```
GIT_SILENT
```
  326f11a4
- GIT_SILENT Sync po/docbooks with svn · 09188a1b
  Script Kiddy authored Jan 21, 2023
  
  09188a1b
19 Jan, 2023 3 commits
- Record quicksettings: Move metadata.json to right location · 7a9565ff
  Fabian Vogt authored Jan 19, 2023
```
It needs to be next to contents/, not inside.
```
  7a9565ff
- Update version number for 5.28.80 · 7a8b537a
  Jonathan Esk-Riddell authored Jan 19, 2023
```
GIT_SILENT
```
  7a8b537a
- Update version number for 5.26.90 · 931a1eda
  Jonathan Esk-Riddell authored Jan 19, 2023
```
GIT_SILENT
```
  931a1eda
18 Jan, 2023 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · cae02350

Script Kiddy authored Jan 18, 2023

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"

cae02350

17 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 52e4f4a5
  Script Kiddy authored Jan 17, 2023
  
  52e4f4a5
16 Jan, 2023 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 491848ac

Script Kiddy authored Jan 16, 2023

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"

491848ac

14 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 9c88a559
  Script Kiddy authored Jan 14, 2023
  
  9c88a559
- GIT_SILENT Sync po/docbooks with svn · fa9b2507
  Script Kiddy authored Jan 14, 2023
  
  fa9b2507
13 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · b02c94d3
  Script Kiddy authored Jan 13, 2023
  
  b02c94d3
11 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · cc74cd15
  Script Kiddy authored Jan 11, 2023
  
  cc74cd15
10 Jan, 2023 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 64b32ea3

Script Kiddy authored Jan 10, 2023

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"

64b32ea3

09 Jan, 2023 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · e2ace4e6

Script Kiddy authored Jan 09, 2023

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"

e2ace4e6

07 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 3062d892
  Script Kiddy authored Jan 07, 2023
  
  3062d892
- SVN_SILENT made messages (.desktop file) - always resolve ours · b8e44cae
  Script Kiddy authored Jan 07, 2023
```
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"
```
  b8e44cae
06 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 25f3f3b4
  Script Kiddy authored Jan 06, 2023
  
  25f3f3b4
- SVN_SILENT made messages (.desktop file) - always resolve ours · a1da4b29
  Script Kiddy authored Jan 06, 2023
```
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"
```
  a1da4b29
05 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · dae82be7
  Script Kiddy authored Jan 05, 2023
  
  dae82be7
- SVN_SILENT made messages (.desktop file) - always resolve ours · e88082ca
  Script Kiddy authored Jan 05, 2023
```
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"
```
  e88082ca
04 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 1ddf5366
  Script Kiddy authored Jan 04, 2023
  
  1ddf5366
- SVN_SILENT made messages (.desktop file) - always resolve ours · 16ddca77
  Script Kiddy authored Jan 04, 2023
```
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"
```
  16ddca77
03 Jan, 2023 2 commits
- Ensure that package descriptions specify that they are for Plasma Mobile · fdf1d739
  Devin Lin authored Jan 02, 2023
```
Since these packages can appear in Discover and confuse users about what they are for.
```
  fdf1d739
- GIT_SILENT Sync po/docbooks with svn · d19db077
  Script Kiddy authored Jan 03, 2023
  
  d19db077
01 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 806318bf
  Script Kiddy authored Jan 01, 2023
  
  806318bf