Add Polish translation to .desktop file #4

Merged
MicheleC merged 1 commits from other/pl-translate-desktop into master 4 years ago
Collaborator

Signed-off-by: Jan Stolarek jan.stolarek@ed.ac.uk

Signed-off-by: Jan Stolarek <jan.stolarek@ed.ac.uk>
MicheleC merged commit e1ec886c6b into master 4 years ago
MicheleC deleted branch other/pl-translate-desktop 4 years ago
Owner

Looks good thanks Janek!

Looks good thanks Janek!
MicheleC added this to the R14.0.9 release milestone 4 years ago
Poster
Collaborator

What happens with the merged branches? Should I delete them once they are merged?

What happens with the merged branches? Should I delete them once they are merged?
Owner

The branch on the remote repository is deleted by us after we rebase and merge. so you can safely delete it on your side too.

The easy way is to run

git fetch --all --prune
git checkout master
git rebase -S
git branch -D <the branch you want to delete>

This will sync your local repo with the remote one, update your master branch and remove the local branch no longer in use.

The branch on the remote repository is deleted by us after we rebase and merge. so you can safely delete it on your side too. The easy way is to run ``` git fetch --all --prune git checkout master git rebase -S git branch -D <the branch you want to delete> ``` This will sync your local repo with the remote one, update your master branch and remove the local branch no longer in use.
Owner

if you have fzf installed, you can use this command to make it super fast:

# remove local branch
grlb()
{
	git branch | fzf | xargs -I{} bash -ic 'git br -D {}'
	git branch
}

then select the branch to delete from the ones presented. Be careful to choose the right one 😉

if you have fzf installed, you can use this command to make it super fast: ``` # remove local branch grlb() { git branch | fzf | xargs -I{} bash -ic 'git br -D {}' git branch } ``` then select the branch to delete from the ones presented. Be careful to choose the right one :wink:
Poster
Collaborator

I get an impression that this still didn't make it into the packages. Is it possible to rebuild the package?

I get an impression that this still didn't make it into the packages. Is it possible to rebuild the package?
Owner

The code was definitely merged in both master and R14.0.x. Which means packages would be automatically rebuilt after that (usually).

This is the latest version of the package gtk-qt-engine-trinity available on PSB (bullseye amd 64): 4:14.0.9~pre20-0debian11.0.0+0~a, with the Packages file date from today.

The code was definitely merged in both master and R14.0.x. Which means packages would be automatically rebuilt after that (usually). This is the latest version of the package gtk-qt-engine-trinity available on PSB (bullseye amd 64): 4:14.0.9~pre20-0debian11.0.0+0~a, with the Packages file date from today.
Owner

I get an impression that this still didn't make it into the packages. Is it possible to rebuild the package?

Done.

> I get an impression that this still didn't make it into the packages. Is it possible to rebuild the package? Done.
Poster
Collaborator

Thanks Slavek! I just pulled an updated version.

Thanks Slavek! I just pulled an updated version.
The pull request has been merged as e1ec886c6b.
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
3 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: TDE/gtk-qt-engine#4
Loading…
There is no content yet.