diff -Nru polari-3.36.0/data/appdata/meson.build polari-3.36.1/data/appdata/meson.build --- polari-3.36.0/data/appdata/meson.build 2020-03-07 21:06:20.179245700 +0000 +++ polari-3.36.1/data/appdata/meson.build 2020-03-30 23:01:49.212983800 +0000 @@ -13,4 +13,13 @@ args: ['validate', '--nonet', appdata], workdir: meson.current_build_dir() ) + + r = run_command(appstream_util, '--help') + if (r.stdout().contains('validate-version')) + test('Checking release entry for @0@'.format(meson.project_version()), + appstream_util, + args: ['validate-version', appdata, meson.project_version()], + workdir: meson.current_build_dir() + ) + endif endif diff -Nru polari-3.36.0/data/appdata/org.gnome.Polari.appdata.xml.in polari-3.36.1/data/appdata/org.gnome.Polari.appdata.xml.in --- polari-3.36.0/data/appdata/org.gnome.Polari.appdata.xml.in 2020-03-07 21:06:20.179245700 +0000 +++ polari-3.36.1/data/appdata/org.gnome.Polari.appdata.xml.in 2020-03-30 23:01:49.212983800 +0000 @@ -22,19 +22,19 @@ - https://gitlab.gnome.org/GNOME/polari/raw/master/data/appdata/polari-main.png + https://gitlab.gnome.org/GNOME/polari/raw/gnome-3-36/data/appdata/polari-main.png - https://gitlab.gnome.org/GNOME/polari/raw/master/data/appdata/polari-user-list.png + https://gitlab.gnome.org/GNOME/polari/raw/gnome-3-36/data/appdata/polari-user-list.png - https://gitlab.gnome.org/GNOME/polari/raw/master/data/appdata/polari-join-dialog.png + https://gitlab.gnome.org/GNOME/polari/raw/gnome-3-36/data/appdata/polari-join-dialog.png - https://gitlab.gnome.org/GNOME/polari/raw/master/data/appdata/polari-connection.png + https://gitlab.gnome.org/GNOME/polari/raw/gnome-3-36/data/appdata/polari-connection.png - https://gitlab.gnome.org/GNOME/polari/raw/master/data/appdata/polari-connection-properties.png + https://gitlab.gnome.org/GNOME/polari/raw/gnome-3-36/data/appdata/polari-connection-properties.png org.gnome.Polari.desktop @@ -55,6 +55,7 @@ polari +

diff -Nru polari-3.36.0/debian/changelog polari-3.36.1/debian/changelog --- polari-3.36.0/debian/changelog 2020-03-24 11:33:08.000000000 +0000 +++ polari-3.36.1/debian/changelog 2020-03-31 00:59:16.000000000 +0000 @@ -1,3 +1,9 @@ +polari (3.36.1-1) unstable; urgency=medium + + * New upstream release + + -- Jeremy Bicha Mon, 30 Mar 2020 20:59:16 -0400 + polari (3.36.0-1) unstable; urgency=medium * New upstream release diff -Nru polari-3.36.0/meson.build polari-3.36.1/meson.build --- polari-3.36.0/meson.build 2020-03-07 21:06:20.211244800 +0000 +++ polari-3.36.1/meson.build 2020-03-30 23:01:49.230983500 +0000 @@ -1,5 +1,5 @@ project('polari', 'c', - version: '3.36.0', + version: '3.36.1', meson_version: '>= 0.51.0', license: 'GPL2+' ) diff -Nru polari-3.36.0/NEWS polari-3.36.1/NEWS --- polari-3.36.0/NEWS 2020-03-07 21:06:20.172245700 +0000 +++ polari-3.36.1/NEWS 2020-03-30 23:01:49.212983800 +0000 @@ -1,3 +1,13 @@ +3.36.1 +====== +* Misc. cleanups [Florian; !150, !151] + +Contributors: + Florian Müllner + +Translators: + Daniel Korostil [uk], Daniel Șerbănescu [ro] + 3.36.0 — “Very Macho Homosexual Camper” ======================================= * Fix URL previews in flatpak [Florian; !147] diff -Nru polari-3.36.0/po/ro.po polari-3.36.1/po/ro.po --- polari-3.36.0/po/ro.po 2020-03-07 21:06:20.228244300 +0000 +++ polari-3.36.1/po/ro.po 2020-03-30 23:01:49.242983000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: polari master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/polari/issues\n" -"POT-Creation-Date: 2019-07-31 22:19+0000\n" -"PO-Revision-Date: 2019-08-05 15:33+0200\n" +"POT-Creation-Date: 2020-02-12 19:02+0000\n" +"PO-Revision-Date: 2020-03-18 08:31+0100\n" "Last-Translator: Daniel Șerbănescu \n" "Language-Team: Gnome Romanian Translation Team\n" "Language: ro\n" @@ -17,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2);\n" -"X-Generator: Poedit 2.2.3\n" +"X-Generator: Poedit 2.3\n" "X-Project-Style: gnome\n" #: data/appdata/org.gnome.Polari.appdata.xml.in:7 @@ -27,7 +27,7 @@ msgstr "Polari" #: data/appdata/org.gnome.Polari.appdata.xml.in:8 -#: data/org.gnome.Polari.desktop.in:4 src/application.js:849 +#: data/org.gnome.Polari.desktop.in:4 src/application.js:847 msgid "An Internet Relay Chat Client for GNOME" msgstr "Un client IRC pentru GNOME" @@ -204,50 +204,60 @@ #: data/resources/help-overlay.ui:48 msgctxt "shortcut window" +msgid "Show Help" +msgstr "Arată ajutorul" + +#: data/resources/help-overlay.ui:55 +msgctxt "shortcut window" +msgid "Open Menu" +msgstr "Deschide meniul" + +#: data/resources/help-overlay.ui:62 +msgctxt "shortcut window" msgid "Quit" msgstr "Ieșire" -#: data/resources/help-overlay.ui:55 +#: data/resources/help-overlay.ui:69 msgctxt "shortcut window" msgid "Keyboard Shortcuts" msgstr "Scurtături de tastatură" -#: data/resources/help-overlay.ui:64 +#: data/resources/help-overlay.ui:78 msgctxt "shortcut window" msgid "Navigation" msgstr "Navigare" -#: data/resources/help-overlay.ui:68 +#: data/resources/help-overlay.ui:82 msgctxt "shortcut window" msgid "Next Room" msgstr "Camera următoare" -#: data/resources/help-overlay.ui:75 +#: data/resources/help-overlay.ui:89 msgctxt "shortcut window" msgid "Previous Room" msgstr "Camera precedentă" -#: data/resources/help-overlay.ui:82 +#: data/resources/help-overlay.ui:96 msgctxt "shortcut window" msgid "Next Room with Unread Messages" msgstr "Următoarea cameră cu mesaje necitite" -#: data/resources/help-overlay.ui:89 +#: data/resources/help-overlay.ui:103 msgctxt "shortcut window" msgid "Previous Room with Unread Messages" msgstr "Precedenta cameră cu mesaje necitite" -#: data/resources/help-overlay.ui:96 +#: data/resources/help-overlay.ui:110 msgctxt "shortcut window" msgid "First Room" msgstr "Prima cameră" -#: data/resources/help-overlay.ui:103 +#: data/resources/help-overlay.ui:117 msgctxt "shortcut window" msgid "Last Room" msgstr "Ultima cameră" -#: data/resources/help-overlay.ui:110 +#: data/resources/help-overlay.ui:124 msgctxt "shortcut window" msgid "First – Ninth Room" msgstr "Prima – A noua camera" @@ -329,15 +339,15 @@ msgid "Add rooms and networks" msgstr "Adăugare canale și rețele" -#: data/resources/main-window.ui:196 +#: data/resources/main-window.ui:197 msgid "Show connected users" msgstr "Arată utilizatorii conectați" -#: data/resources/main-window.ui:224 src/roomList.js:400 src/userList.js:456 +#: data/resources/main-window.ui:225 src/roomList.js:400 src/userList.js:456 msgid "Offline" msgstr "Deconectat" -#: data/resources/main-window.ui:233 +#: data/resources/main-window.ui:234 msgid "Go online to chat and receive messages." msgstr "Conectați-vă online pentru a discuta și primi mesaje." @@ -405,31 +415,31 @@ msgid "Print version and exit" msgstr "Afișează versiunea și ieși" -#: src/application.js:479 src/utils.js:185 +#: src/application.js:479 src/utils.js:188 msgid "Failed to open link" msgstr "Nu s-a putut deschide legătura" -#: src/application.js:772 +#: src/application.js:770 #, javascript-format msgid "%s removed." msgstr "S-a eliminat %s." -#: src/application.js:848 +#: src/application.js:846 msgid "translator-credits" msgstr "" "Bogdan Mințoi , 2014\n" -"Daniel Șerbănescu , 2017-2019\n" +"Daniel Șerbănescu , 2017-2020\n" "Florentina Mușat , 2019" -#: src/application.js:854 +#: src/application.js:852 msgid "Learn more about Polari" msgstr "Învață mai multe despre Polari" -#: src/appNotifications.js:87 +#: src/appNotifications.js:85 msgid "Undo" msgstr "Anulează" -#: src/chatView.js:137 +#: src/chatView.js:138 msgid "New Messages" msgstr "Mesaj nou" @@ -537,16 +547,17 @@ msgid "%B %d %Y, %H∶%M" msgstr "%d %B %Y, %H∶%M" +#. eslint-disable-next-line no-lonely-if #. today #. Translators: Time in 12h format -#: src/chatView.js:1200 +#: src/chatView.js:1201 msgid "%l∶%M %p" msgstr "%l∶%M %p" #. yesterday #. Translators: this is the word "Yesterday" followed by a #. time string in 12h format. i.e. "Yesterday, 2:30 pm" -#: src/chatView.js:1205 +#: src/chatView.js:1206 #, no-c-format msgid "Yesterday, %l∶%M %p" msgstr "Ieri, %l∶%M %p" @@ -554,7 +565,7 @@ #. this week #. Translators: this is the week day name followed by a time #. string in 12h format. i.e. "Monday, 2:30 pm" -#: src/chatView.js:1210 +#: src/chatView.js:1211 #, no-c-format msgid "%A, %l∶%M %p" msgstr "%A, %l∶%M %p" @@ -563,7 +574,7 @@ #. Translators: this is the month name and day number #. followed by a time string in 12h format. #. i.e. "May 25, 2:30 pm" -#: src/chatView.js:1216 +#: src/chatView.js:1217 #, no-c-format msgid "%B %d, %l∶%M %p" msgstr "%d %B, %l∶%M %p" @@ -572,7 +583,7 @@ #. Translators: this is the month name, day number, year #. number followed by a time string in 12h format. #. i.e. "May 25 2012, 2:30 pm" -#: src/chatView.js:1222 +#: src/chatView.js:1223 #, no-c-format msgid "%B %d %Y, %l∶%M %p" msgstr "%d %B %Y, %l∶%M %p" @@ -598,7 +609,7 @@ "Polari s-a deconectat datorită unei probleme de rețea. Verificați dacă " "câmpul adresei este corect." -#: src/entryArea.js:368 +#: src/entryArea.js:369 #, javascript-format msgid "Paste %s line of text to public paste service?" msgid_plural "Paste %s lines of text to public paste service?" @@ -606,7 +617,7 @@ msgstr[1] "Lipesc %s linii de text pe serviciul public de note?" msgstr[2] "Lipesc %s de linii de text pe serviciul public de note?" -#: src/entryArea.js:372 +#: src/entryArea.js:373 #, javascript-format msgid "Uploading %s line of text to public paste service…" msgid_plural "Uploading %s lines of text to public paste service…" @@ -614,33 +625,33 @@ msgstr[1] "Se încarcă %s linii de text la serviciul public de note…" msgstr[2] "Se încarcă %s de linii de text la serviciul public de note…" -#: src/entryArea.js:379 +#: src/entryArea.js:380 msgid "Upload image to public paste service?" msgstr "Doriți încărcarea imaginii pe serviciul public de note?" -#: src/entryArea.js:380 +#: src/entryArea.js:381 msgid "Uploading image to public paste service…" msgstr "Se încarcă imaginea pe serviciul public de note…" #. Translators: %s is a filename -#: src/entryArea.js:402 +#: src/entryArea.js:403 #, javascript-format msgid "Upload “%s” to public paste service?" msgstr "Încarc „%s” pe serviciul public de note?" #. Translators: %s is a filename -#: src/entryArea.js:404 +#: src/entryArea.js:405 #, javascript-format msgid "Uploading “%s” to public paste service…" msgstr "Se încarcă „%s” la serviciul public de note…" #. translators: %s is a nick, #%s a channel -#: src/entryArea.js:413 +#: src/entryArea.js:414 #, javascript-format msgid "%s in #%s" msgstr "%s în #%s" -#: src/entryArea.js:415 +#: src/entryArea.js:416 #, javascript-format msgid "Paste from %s" msgstr "Lipește de la %s" @@ -829,7 +840,7 @@ msgid "Should the password be saved?" msgstr "Doriți salvarea parolei?" -#: src/roomStack.js:100 src/telepathyClient.js:648 +#: src/roomStack.js:100 src/telepathyClient.js:651 #, javascript-format msgid "" "Identification will happen automatically the next time you connect to %s" @@ -873,24 +884,24 @@ msgid "Join a room using the + button." msgstr "Alăturați-vă unei camere de discuții utilizând butonul +." -#: src/telepathyClient.js:461 +#: src/telepathyClient.js:464 msgid "Good Bye" msgstr "La revedere" #. Translators: Those are a botname and an accountName, e.g. #. "Save NickServ password for GNOME" -#: src/telepathyClient.js:647 +#: src/telepathyClient.js:650 #, javascript-format msgid "Save %s password for %s?" msgstr "Doriți salvarea parolei %s pentru %s?" -#: src/telepathyClient.js:651 +#: src/telepathyClient.js:654 msgid "Save" msgstr "Salvează" #. Translators: This is the title of the notification announcing a newly #. received message, in the form "user-nickname in room-display-name" -#: src/telepathyClient.js:683 +#: src/telepathyClient.js:686 #, javascript-format msgid "%s in %s" msgstr "%s în %s" diff -Nru polari-3.36.0/po/uk.po polari-3.36.1/po/uk.po --- polari-3.36.0/po/uk.po 2020-03-07 21:06:20.230244400 +0000 +++ polari-3.36.1/po/uk.po 2020-03-30 23:01:49.244983000 +0000 @@ -1,17 +1,17 @@ -# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# # Daniel Korostil , 2013-2019. # Danylo Korostil , 2020. -# +# Yuri Chornoivan , 2020. msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/polari/issues\n" -"POT-Creation-Date: 2019-12-25 12:39+0000\n" -"PO-Revision-Date: 2020-01-29 14:13+0200\n" -"Last-Translator: Danylo Korostil \n" -"Language-Team: \n" +"POT-Creation-Date: 2020-02-12 19:02+0000\n" +"PO-Revision-Date: 2020-03-11 20:36+0200\n" +"Last-Translator: Yuri Chornoivan \n" +"Language-Team: Ukrainian \n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +19,7 @@ "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" "n%10<=4 && (n%100<10 || n%100>=20) ? 1: 2);\n" -"X-Generator: Gtranslator 3.34.0\n" +"X-Generator: Lokalize 20.03.70\n" "X-Project-Style: gnome\n" #: data/appdata/org.gnome.Polari.appdata.xml.in:7 @@ -203,51 +203,64 @@ msgstr "Показати емоції" #: data/resources/help-overlay.ui:48 +#| msgctxt "shortcut window" +#| msgid "Show Userlist" +msgctxt "shortcut window" +msgid "Show Help" +msgstr "Показати довідку" + +#: data/resources/help-overlay.ui:55 +#| msgid "Open Link" +msgctxt "shortcut window" +msgid "Open Menu" +msgstr "Відкрити меню" + +#: data/resources/help-overlay.ui:62 msgctxt "shortcut window" msgid "Quit" msgstr "Вийти" -#: data/resources/help-overlay.ui:55 +#: data/resources/help-overlay.ui:69 msgctxt "shortcut window" msgid "Keyboard Shortcuts" msgstr "Клавіатурні скорочення" -#: data/resources/help-overlay.ui:64 +#: data/resources/help-overlay.ui:78 msgctxt "shortcut window" msgid "Navigation" msgstr "Пересування" -#: data/resources/help-overlay.ui:68 +#: data/resources/help-overlay.ui:82 msgctxt "shortcut window" msgid "Next Room" msgstr "Наступна кімната" -#: data/resources/help-overlay.ui:75 +#: data/resources/help-overlay.ui:89 msgctxt "shortcut window" msgid "Previous Room" msgstr "Попередня кімната" -#: data/resources/help-overlay.ui:82 +#: data/resources/help-overlay.ui:96 msgctxt "shortcut window" msgid "Next Room with Unread Messages" msgstr "Наступна кімната з непрочитаними повідомленнями" -#: data/resources/help-overlay.ui:89 +#: data/resources/help-overlay.ui:103 msgctxt "shortcut window" msgid "Previous Room with Unread Messages" msgstr "Попередня кімната з непрочитаними повідомленнями" -#: data/resources/help-overlay.ui:96 +#: data/resources/help-overlay.ui:110 msgctxt "shortcut window" msgid "First Room" msgstr "Перша кімната" -#: data/resources/help-overlay.ui:103 +#: data/resources/help-overlay.ui:117 msgctxt "shortcut window" msgid "Last Room" msgstr "Остання кімната" -#: data/resources/help-overlay.ui:110 +#: data/resources/help-overlay.ui:124 msgctxt "shortcut window" msgid "First – Ninth Room" msgstr "Перша — дев'ята кімната" @@ -329,15 +342,15 @@ msgid "Add rooms and networks" msgstr "Додати кімнати та мережі" -#: data/resources/main-window.ui:196 +#: data/resources/main-window.ui:197 msgid "Show connected users" msgstr "Показати під'єднаних користувачів" -#: data/resources/main-window.ui:224 src/roomList.js:400 src/userList.js:456 +#: data/resources/main-window.ui:225 src/roomList.js:400 src/userList.js:456 msgid "Offline" msgstr "Поза мережею" -#: data/resources/main-window.ui:233 +#: data/resources/main-window.ui:234 msgid "Go online to chat and receive messages." msgstr "Під'єднайтесь до мережі, щоб спілкуватися та отримувати повідомлення."