lp:~elementary-design/pantheon-photos/update-sidebar-icons

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~pantheon-photos/pantheon-photos/trunk at revision 2506

Jim Nelson: Needs Fixing on 2014-02-05

Tristan Petersen: Approve on 2014-02-02

Diff: 224 lines (+166/-10)

2 files modified

icons/folder-tag.svg (+157/-0)
src/Resources.vala (+9/-10)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1272487: use folder-pictures for "Library"	Medium	Fix Released
Bug #1272492: use "folder-tag" for tags	Medium	Fix Released
Bug #1272495: use "office-calendar" for events	Medium	Fix Released

Link a bug report

Related blueprints

2507. By Danielle Foré on 2014-01-31

merge trunk

2506. By Danielle Foré on 2014-01-31

add folder-tag icon

2505. By Danielle Foré on 2014-01-24

warning can't find shotwell

2504. By Danielle Foré on 2014-01-24

remove unused icon files

2503. By Danielle Foré on 2014-01-24

update some sidebar icons

2502. By Fran Diéguez on 2014-01-20

Updated Galician translations

2501. By 甘露 (Lu Gan) on 2014-01-18

Update Chinese simplified translation

2500. By Daniel Mustieles on 2014-01-16

Updated Spanish translation

2499. By Piotr Drąg on 2014-01-15

Updated Polish translation

2498. By Charles Lindsay on 2014-01-15

Merge po files, set up for intltool and l10n.gnome.org

This removes the custom .pot file setup we had before, making it easy to
translate Shotwell using the standard intltool workflow.

This also merges the two separate core/extras gettext domains into one,
to keep things simple. I hope I've merged all the po files correctly,
but I wouldn't bet money I did it perfectly.

We also set up the help to be able to be translated on l10n.gnome.org.

Closes: bgo #718783