Commits · master · Plasma / KInfoCenter

07 Feb, 2023 3 commits
- cover new smb3 type · b91711cc
  Harald Sitter authored Feb 07, 2023
  
  b91711cc
- Add an ExtraSoftwareData section to kcm-about-distrorc · 2e4394b6
  Jeremy Whiting authored Feb 03, 2023 and Harald Sitter committed Feb 07, 2023
```
When item is present, run the given scripts if possible and add the
values to the gui under their respective names.
```
  2e4394b6
- GIT_SILENT Sync po/docbooks with svn · db0c84fa
  Script Kiddy authored Feb 07, 2023
  
  db0c84fa
06 Feb, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · d2ba864a
  Script Kiddy authored Feb 06, 2023
  
  d2ba864a
- SVN_SILENT made messages (.desktop file) - always resolve ours · 15e05ffe
  Script Kiddy authored Feb 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"
```
  15e05ffe
04 Feb, 2023 1 commit

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

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"

53124cc8

30 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 6c345e4f
  Script Kiddy authored Jan 30, 2023
  
  6c345e4f
29 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 2312d30f
  Script Kiddy authored Jan 29, 2023
  
  2312d30f
27 Jan, 2023 1 commit
- Update version number for 5.27.80 · 9b487c9f
  Jonathan Esk-Riddell authored Jan 27, 2023
```
GIT_SILENT
```
  9b487c9f
24 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 6a53a0f3
  Script Kiddy authored Jan 24, 2023
  
  6a53a0f3
23 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 492fff16
  Script Kiddy authored Jan 23, 2023
  
  492fff16
22 Jan, 2023 1 commit

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

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"

f65c7f41

20 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · d2d95473
  Script Kiddy authored Jan 20, 2023
  
  d2d95473
19 Jan, 2023 3 commits
- Update version number for 5.28.80 · b5592afd
  Jonathan Esk-Riddell authored Jan 19, 2023
```
GIT_SILENT
```
  b5592afd
- Update version number for 5.26.90 · 4842853a
  Jonathan Esk-Riddell authored Jan 19, 2023
```
GIT_SILENT
```
  4842853a
- GIT_SILENT Sync po/docbooks with svn · e7880dcd
  Script Kiddy authored Jan 19, 2023
  
  e7880dcd
18 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 2a1266a5
  Script Kiddy authored Jan 18, 2023
  
  2a1266a5
- SVN_SILENT made messages (.desktop file) - always resolve ours · a56aa683
  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"
```
  a56aa683
17 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · c1ac4c4f
  Script Kiddy authored Jan 17, 2023
  
  c1ac4c4f
16 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 542b314c
  Script Kiddy authored Jan 16, 2023
  
  542b314c
- SVN_SILENT made messages (.desktop file) - always resolve ours · e6c825cf
  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"
```
  e6c825cf
15 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 17c4d1c7
  Script Kiddy authored Jan 15, 2023
  
  17c4d1c7
- SVN_SILENT made messages (.desktop file) - always resolve ours · f0ab75e5
  Script Kiddy authored Jan 15, 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"
```
  f0ab75e5
14 Jan, 2023 3 commits
- GIT_SILENT Sync po/docbooks with svn · 693c55cb
  Script Kiddy authored Jan 14, 2023
  
  693c55cb
- GIT_SILENT Sync po/docbooks with svn · d2f462b0
  Script Kiddy authored Jan 14, 2023
  
  d2f462b0
- GIT_SILENT Sync po/docbooks with svn · df670bae
  Script Kiddy authored Jan 14, 2023
  
  df670bae
13 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · c8aa6b28
  Script Kiddy authored Jan 13, 2023
  
  c8aa6b28
- SVN_SILENT made messages (.desktop file) - always resolve ours · c958911f
  Script Kiddy authored Jan 13, 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"
```
  c958911f
11 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · de55dc39
  Script Kiddy authored Jan 11, 2023
  
  de55dc39
- SVN_SILENT made messages (.desktop file) - always resolve ours · 89d4482c
  Script Kiddy authored Jan 11, 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"
```
  89d4482c
10 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 1a97d8ee
  Script Kiddy authored Jan 10, 2023
  
  1a97d8ee
- SVN_SILENT made messages (.desktop file) - always resolve ours · 439e2839
  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"
```
  439e2839
09 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 5820506d
  Script Kiddy authored Jan 09, 2023
  
  5820506d
- SVN_SILENT made messages (.desktop file) - always resolve ours · 84fee2a3
  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"
```
  84fee2a3
08 Jan, 2023 1 commit

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

Script Kiddy authored Jan 08, 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"

9dd41585

07 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 33fcfab3
  Script Kiddy authored Jan 07, 2023
  
  33fcfab3
06 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · ba545285
  Script Kiddy authored Jan 06, 2023
  
  ba545285
05 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 09d8a61f
  Script Kiddy authored Jan 05, 2023
  
  09d8a61f
04 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · c8c9b731
  Script Kiddy authored Jan 04, 2023
  
  c8c9b731
03 Jan, 2023 1 commit
- Update version number for 5.26.5 · 0c89b188
  Jonathan Esk-Riddell authored Jan 03, 2023
```
GIT_SILENT
```
  0c89b188