Cinnamon testing

~trebelnik-stefina/cinnamon-test/+git/k3b:Applications/17.12

  1. Git
  2. lp:~trebelnik-stefina/cinnamon-test/+git/k3b
  3. Applications/17.12
Last commit made on 2018-03-19
Get this branch:
git clone -b Applications/17.12 https://git.launchpad.net/~trebelnik-stefina/cinnamon-test/+git/k3b

Branch merges

Branch information

Name:
Applications/17.12
Repository:
lp:~trebelnik-stefina/cinnamon-test/+git/k3b

Recent commits

18c56f5... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

1ce2162... by l10n daemon script <email address hidden>

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"

18952a1... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

13a11fc... by Christoph Feck <email address hidden>

GIT_SILENT Upgrade KDE Applications version to 17.12.3.

9073884... by Albert Astals Cid

GIT_SILENT Upgrade KDE Applications version to 17.12.2.

8969b37... by Pino Toscano

ffmpeg: add checks in metadata to string conversion

Improves/fixes commit 1777236203f21eed7a9baade632472094c8081d3.

1512269... by l10n daemon script <email address hidden>

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"

ff58954... by Albert Astals Cid

GIT_SILENT Upgrade KDE Applications version to 17.12.1.

c5ccf6d... by Pino Toscano

Revert "Fix Settings dialog resizes itself issue"

This is bad for usability, as it truncates texts and labels, with no way
to see them in some cases.

This reverts commit 828891b2cbba66f8503805646193728901e40af4.

6a2f976... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)