diff -Nru xed-2.6.0/debian/changelog xed-2.6.0/debian/changelog --- xed-2.6.0/debian/changelog 2020-05-11 13:32:23.000000000 +0000 +++ xed-2.6.0/debian/changelog 2020-06-21 14:32:11.000000000 +0000 @@ -1,8 +1,8 @@ -xed (2.6.0-202005111259~ubuntu18.04.1) bionic; urgency=low +xed (2.6.0-202006211141~ubuntu18.04.1) bionic; urgency=low * Auto build. - -- gogo Mon, 11 May 2020 13:32:23 +0000 + -- gogo Sun, 21 Jun 2020 14:32:11 +0000 xed (2.6.0) ulyana; urgency=medium diff -Nru xed-2.6.0/debian/git-build-recipe.manifest xed-2.6.0/debian/git-build-recipe.manifest --- xed-2.6.0/debian/git-build-recipe.manifest 2020-05-11 13:32:23.000000000 +0000 +++ xed-2.6.0/debian/git-build-recipe.manifest 2020-06-21 14:32:11.000000000 +0000 @@ -1,2 +1,2 @@ -# git-build-recipe format 0.4 deb-version {debupstream}-202005111259 -lp:~trebelnik-stefina/cinnamon-test/+git/xed git-commit:8bb308de4fbac2e5e19128600bab5c1cfc96f8b3 +# git-build-recipe format 0.4 deb-version {debupstream}-202006211141 +lp:~trebelnik-stefina/cinnamon-test/+git/xed git-commit:19bb11e8a05444245c53357e353767e7b8cd72aa diff -Nru xed-2.6.0/po/POTFILES.in xed-2.6.0/po/POTFILES.in --- xed-2.6.0/po/POTFILES.in 2020-05-11 13:32:23.000000000 +0000 +++ xed-2.6.0/po/POTFILES.in 2020-06-21 14:32:11.000000000 +0000 @@ -78,6 +78,8 @@ plugins/filebrowser/xed-file-browser-utils.c plugins/filebrowser/xed-file-browser-view.c plugins/filebrowser/xed-file-browser-widget.c +plugins/joinlines/joinlines.plugin.desktop.in +plugins/joinlines/joinlines/__init__.py plugins/modelines/modeline-parser.c plugins/modelines/modelines.plugin.desktop.in plugins/modelines/xed-modeline-plugin.c diff -Nru xed-2.6.0/po/xed.pot xed-2.6.0/po/xed.pot --- xed-2.6.0/po/xed.pot 2020-05-11 13:32:23.000000000 +0000 +++ xed-2.6.0/po/xed.pot 2020-06-21 14:32:11.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 12:54+0100\n" +"POT-Creation-Date: 2020-06-21 12:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1718,6 +1718,7 @@ msgstr "" #: ../xed/resources/ui/xed-shortcuts.ui.h:51 +#: ../plugins/joinlines/joinlines.plugin.desktop.in.h:1 msgid "Join Lines" msgstr "" @@ -2639,6 +2640,18 @@ msgid "Could not mount volume: %s" msgstr "" +#: ../plugins/joinlines/joinlines.plugin.desktop.in.h:2 +msgid "Join several lines" +msgstr "" + +#: ../plugins/joinlines/joinlines/__init__.py:26 +msgid "_Join Lines" +msgstr "" + +#: ../plugins/joinlines/joinlines/__init__.py:27 +msgid "Join the selected lines" +msgstr "" + #. vi:ts=8 #: ../plugins/modelines/modelines.plugin.desktop.in.h:1 msgid "Modelines"