Commits · be832997d451adab3306e2481ccb72e8c5194638 · Education / Artikulate

10 Oct, 2019 1 commit

Use registered categories in the desktop file. · be832997

Christophe Giboudeaux authored Oct 10, 2019

Summary:
The desktop file spec has a 'Languages' additional category that can be used
for artikulate.
(https://standards.freedesktop.org/menu-spec/latest/apas02.html)

Reviewers: apol

Reviewed By: apol

Subscribers: kde-edu

Tags: #kde_edu

Differential Revision: https://phabricator.kde.org/D24551

be832997

15 Jul, 2019 1 commit

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

Script Kiddy authored Jul 15, 2019

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"

7167a494

10 Oct, 2018 1 commit

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

Script Kiddy authored Oct 10, 2018

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"

d2135755

02 Jan, 2018 3 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · fa647b52
  Script Kiddy authored Nov 21, 2017 and Andreas Cord-Landwehr committed Jan 02, 2018
```
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"
```
  fa647b52
- SVN_SILENT made messages (.desktop file) - always resolve ours · 4330a235
  Script Kiddy authored Oct 16, 2017 and Andreas Cord-Landwehr committed Jan 02, 2018
```
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"
```
  4330a235
- Fix the desktop file (Exec key) · 193ccd4e
  Luigi Toscano authored Aug 20, 2017 and Andreas Cord-Landwehr committed Jan 02, 2018
```
- convert from -caption (Qt4) to -qwindowtitle (Qt5);
- restore the icon parameter as it was (Wayland gets it from the
  already set Icon property).
```
  193ccd4e
21 Nov, 2017 2 commits

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

Script Kiddy authored Nov 21, 2017

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"

84e8071a

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

Script Kiddy authored Nov 21, 2017

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"

0df900ef

16 Oct, 2017 1 commit

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

Script Kiddy authored Oct 16, 2017

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"

2df4d1a9

20 Aug, 2017 1 commit

Fix the desktop file (Exec key) · ebf723e5

Luigi Toscano authored Aug 20, 2017

- convert from -caption (Qt4) to -qwindowtitle (Qt5);
- restore the icon parameter as it was (Wayland gets it from the
  already set Icon property).

ebf723e5

15 Jun, 2017 1 commit
- Fix wayland support · b33272d0
  Laurent Montel authored Jun 15, 2017
  
  b33272d0
20 Dec, 2016 1 commit

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

Script Kiddy authored Dec 20, 2016

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"

d1ef71e4

20 Jul, 2016 1 commit

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

Script Kiddy authored Jul 20, 2016

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"

1c4e78de

19 Feb, 2016 1 commit

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

Script Kiddy authored Feb 19, 2016

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"

fd8510db

25 Jan, 2016 1 commit

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

Script Kiddy authored Jan 25, 2016

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"

7aa3f015

13 Oct, 2015 1 commit

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

Script Kiddy authored Oct 13, 2015

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"

40619502

07 Aug, 2015 1 commit
- Use reverse domain name format. · 51fbda6c
  Andreas Cord-Landwehr authored Aug 07, 2015
  
  51fbda6c
03 Apr, 2015 1 commit

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

Script Kiddy authored Apr 03, 2015

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"

0f023052

06 Mar, 2015 1 commit
- SVN_SILENT made messages (.desktop file) · b31cd1c9
  Script Kiddy authored Mar 06, 2015
  
  b31cd1c9
25 Jul, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · d28be03e
  Script Kiddy authored Jul 25, 2014
  
  d28be03e
24 Jul, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · c0779d2f
  Script Kiddy authored Jul 24, 2014
  
  c0779d2f
19 Jul, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 3bfde408
  Script Kiddy authored Jul 19, 2014
  
  3bfde408
16 Jul, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 5a9a7be9
  Script Kiddy authored Jul 16, 2014
  
  5a9a7be9
15 May, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 29cc4b5d
  Script Kiddy authored May 15, 2014
  
  29cc4b5d
04 May, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 4b5e6cf4
  Script Kiddy authored May 04, 2014
  
  4b5e6cf4
07 Apr, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 56dbba16
  Script Kiddy authored Apr 07, 2014
  
  56dbba16
24 Mar, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 87cd7903
  Script Kiddy authored Mar 24, 2014
  
  87cd7903
23 Mar, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 2cc4c7e9
  Script Kiddy authored Mar 23, 2014
  
  2cc4c7e9
16 Mar, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 6b74fc4b
  Script Kiddy authored Mar 16, 2014
  
  6b74fc4b
12 Mar, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · cd3c3a47
  Script Kiddy authored Mar 12, 2014
  
  cd3c3a47
04 Mar, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · bf1d09ac
  Script Kiddy authored Mar 04, 2014
  
  bf1d09ac
02 Mar, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 609f44cf
  Script Kiddy authored Mar 02, 2014
  
  609f44cf
28 Feb, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · ad08a71b
  Script Kiddy authored Feb 28, 2014
  
  ad08a71b
24 Feb, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 045f97e0
  Script Kiddy authored Feb 24, 2014
  
  045f97e0
23 Feb, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 7395a0c6
  Script Kiddy authored Feb 23, 2014
  
  7395a0c6
22 Feb, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 31c21631
  Script Kiddy authored Feb 22, 2014
  
  31c21631
13 Jan, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 3c4e0c75
  Script Kiddy authored Jan 13, 2014
  
  3c4e0c75
12 Jan, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 9a077f99
  Script Kiddy authored Jan 12, 2014
  
  9a077f99
29 Dec, 2013 1 commit
- SVN_SILENT made messages (.desktop file) · b453b277
  Script Kiddy authored Dec 29, 2013
  
  b453b277
02 Dec, 2013 1 commit
- SVN_SILENT made messages (.desktop file) · ec731c70
  Script Kiddy authored Dec 02, 2013
  
  ec731c70