Hello community, here is the log from the commit of package psi+ for openSUSE:Factory checked in at 2017-04-11 09:38:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/psi+ (Old) and /work/SRC/openSUSE:Factory/.psi+.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "psi+" Tue Apr 11 09:38:45 2017 rev:37 rq:484189 version:20170321 Changes: -------- --- /work/SRC/openSUSE:Factory/psi+/psi+.changes 2017-02-16 17:01:12.488469566 +0100 +++ /work/SRC/openSUSE:Factory/.psi+.new/psi+.changes 2017-04-11 09:38:52.550371238 +0200 @@ -1,0 +2,12 @@ +Fri Mar 24 13:20:01 UTC 2017 - [email protected] + +- update to 20170321 + * updated translations + * some bugfixes + * added httpupload and imagepreview plugins +- switch to use cmake & ninja (new support) +- join -icons, -sounds and -themes into -data +- use qt5 on leap >= 42.2 too +- drop psi+-appdata-desktop-reference.patch: appdata no longer used + +------------------------------------------------------------------- Old: ---- psi+-20170212.tar.xz psi+-appdata-desktop-reference.patch New: ---- psi+-20170321.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psi+.spec ++++++ --- /var/tmp/diff_new_pack.Rj4DB4/_old 2017-04-11 09:38:53.702208527 +0200 +++ /var/tmp/diff_new_pack.Rj4DB4/_new 2017-04-11 09:38:53.706207962 +0200 @@ -16,33 +16,32 @@ # -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} > 1320 || 0%{?leap_version} >= 420200 %define with_qt5 1 +%define __builder ninja %endif -%define version_unconverted 20170212 +%define version_unconverted 20170321 Name: psi+ Url: https://github.com/psi-plus -Version: 20170212 +Version: 20170321 Release: 0 Summary: Jabber client using Qt License: GPL-2.0+ Group: Productivity/Networking/Talk/Clients Source0: psi+-%{version}.tar.xz Source1: psi-plus-l10n-1.tar.xz -# PATCH-FIX-UPSTREAM psi+-appdata-desktop-reference.patch [email protected] -- Fix the reference to the .desktop file in appdata.xml: upstream installs psi.desktop as psi-plus.desktop, psi.appdata.xml as psi-plus.appdata.xml. The reference inside the appdata.xml has to match in order for the linking between appdata file and .desktop file to work -Patch0: psi+-appdata-desktop-reference.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: aspell-devel +BuildRequires: cmake >= 3 BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: gdb +BuildRequires: hunspell-devel BuildRequires: libidn-devel BuildRequires: libotr-devel BuildRequires: libproxy-devel %if 0%{?with_qt5} -BuildRequires: libqt5-linguist +BuildRequires: libqt5-linguist-devel BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) @@ -62,14 +61,15 @@ %endif BuildRequires: libXScrnSaver-devel BuildRequires: libtidy-devel +%if "%{__builder}" == "ninja" +BuildRequires: ninja +%endif BuildRequires: openssl-devel BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: zlib-devel Recommends: %{name}-lang = %{version} -Requires: %{name}-icons = %{version} -Requires: %{name}-sounds = %{version} -Requires: %{name}-themes = %{version} +Requires: %{name}-data = %{version} Obsoletes: psi %define iconspath %{_datadir}/psi-plus/iconsets @@ -83,41 +83,28 @@ the features necessary to chat, with no bloated extras that slow your computer down. -%package icons -Summary: Icons for Psi +%package data +Summary: Data for Psi+ Group: Productivity/Networking/Talk/Clients -Requires: %{name} = %{version} BuildArch: noarch +Provides: %{name}-icons = %{version} +Obsoletes: %{name}-icons <= %{version} +Provides: %{name}-sounds = %{version} +Obsoletes: %{name}-sounds <= %{version} +Provides: %{name}-themes = %{version} +Obsoletes: %{name}-themes <= %{version} -%description icons -Icons for Psi. +%description data +Icons, sounds, and themes for Psi+. %package lang -Summary: Translations for Psi +Summary: Translations for Psi+ Group: Productivity/Networking/Talk/Clients Requires: %{name} = %{version} BuildArch: noarch %description lang -Translations for Psi. - -%package sounds -Summary: Icons for Psi -Group: Productivity/Networking/Talk/Clients -Requires: %{name} = %{version} -BuildArch: noarch - -%description sounds -Sounds for Psi. - -%package themes -Summary: Themes for Psi -Group: Productivity/Networking/Talk/Clients -Requires: %{name} = %{version} -BuildArch: noarch - -%description themes -Themes for Psi. +Various translations for Psi+. %package plugins-devel Summary: Headers for Psi plugins @@ -420,88 +407,38 @@ %prep %setup -q -b 1 -%patch0 -p1 %if 0%{?with_qt5} sed -i 's@\<lrelease\>@&-qt5@' ../psi-plus-l10n-1/update-translations.sh %endif -# generic/antievil does not build (yet) -# generic/consoledump does not build (yet) -# generic/chess is a standalone app for chessplugin -# generic/echo does not build (yet) -# generic/noughtsandcrosses does not build (needs old Qt3 support) -# generic/null is a nop -# generic/python does not build (needs old python 2 and has invalid -I) -# generic/urlwatcher does not build (yet) -GENERIC_PLUGINS="attentionplugin autoreplyplugin birthdayreminderplugin - captchaformsplugin cleanerplugin clientswitcherplugin - conferenceloggerplugin contentdownloaderplugin enummessagesplugin - extendedmenuplugin - extendedoptionsplugin gmailserviceplugin gnupgplugin gomokugameplugin - historykeeperplugin httpuploadplugin chessplugin icqdieplugin - imageplugin imagepreviewplugin - jabberdiskplugin juickplugin messagefilterplugin otrplugin - pepchangenotifyplugin - qipxstatusesplugin screenshotplugin skinsplugin stopspamplugin - storagenotesplugin translateplugin videostatusplugin watcherplugin" -UNIX_PLUGINS="gnome3supportplugin" -PLUGINS="`echo -n $GENERIC_PLUGINS | sed 's@\<@generic/@g'`" -PLUGINS="$PLUGINS `echo -n $UNIX_PLUGINS | sed 's@\<@unix/@g'`" - -%if 0%{?with_qt5} -QMAKE=qmake-qt5 -%else -QMAKE=qmake -%endif - -# generate Makefile for plugins -cat >src/plugins/Makefile <<EOF -SUBDIRS=$PLUGINS -PLUGINS_PATH=/usr/lib64/ -INSTALL=install - -all: \$(SUBDIRS) - -install: - \$(INSTALL) -d \$(PLUGINS_PATH) - for DIR in \$(SUBDIRS); do \ - PLUGIN="lib\`basename \$\$DIR\`.so"; \ - \$(INSTALL) -m 755 \$\$DIR/\$\$PLUGIN \$(PLUGINS_PATH); \ - done - -\$(SUBDIRS):: - cd \$@; $QMAKE - \$(MAKE) -C \$@ \$(MAKECMDGOALS) -EOF - %build -# do not use %%configure - not real configure script -export QMAKE_CXXFLAGS="%{optflags}" -./configure --prefix=%{_prefix} --libdir=%{_libdir} \ - --enable-webkit \ - --enable-whiteboarding \ -%if 0%{?with_qt5} - --with-qca-inc=/usr/include/qt5/Qca-qt5/ \ - --with-qca-lib=/usr/lib64 \ +%cmake \ +%if 0%{?with_qt5} == 0 + -DUSE_QT5=OFF \ %endif - --debug --no-separate-debug-info -make %{?_smp_mflags} + -DENABLE_PLUGINS=ON -make -C src/plugins %{?_smp_mflags} +#%%make_jobs won't work -- overriden by qmake's -- opencode it +%if "%{__builder}" == "ninja" + ninja -v %{?_smp_mflags} +%else + %__make %{?_smp_mflags} VERBOSE=1 +%endif cd %{_builddir}/psi-plus-l10n-1/ ./update-translations.sh make %install -make INSTALL_ROOT=%{buildroot} install -rm -f %{buildroot}%{_datadir}/psi-plus/{COPYING,README} -rm -f %{buildroot}%{_datadir}/psi-plus/iconsets/emoticons/utils/smiles_conv.zip +%cmake_install + %suse_update_desktop_file psi-plus -# plugins -make -C src/plugins %{?_smp_mflags} install \ - PLUGINS_PATH="%{buildroot}%{pluginspath}" +# plugins-devel +install -d %{buildroot}%{_datadir}/psi-plus/plugins/include/ +install -m 0644 -t %{buildroot}%{_datadir}/psi-plus/plugins/ src/plugins/plugins.pri +install -m 0644 -t %{buildroot}%{_datadir}/psi-plus/plugins/include/ src/plugins/include/* +sed -e 's:target.path.*:target.path = %pluginspath:' src/plugins/psiplugin.pri > %{buildroot}%{_datadir}/psi-plus/plugins/psiplugin.pri # translations install -m 0644 -t %{buildroot}%{_datadir}/psi-plus ../psi-plus-l10n-1/out/*.qm @@ -648,21 +585,8 @@ %defattr(-,root,root) %doc ChangeLog COPYING README TODO %{_bindir}/psi-plus -%dir %{_datadir}/appdata -%{_datadir}/appdata/psi-plus.appdata.xml +%{_datadir}/pixmaps/psi-plus.png %{_datadir}/applications/psi-plus.desktop -%dir %{_datadir}/icons/hicolor/ -%dir %{_datadir}/icons/hicolor/16x16 -%dir %{_datadir}/icons/hicolor/16x16/apps -%dir %{_datadir}/icons/hicolor/32x32 -%dir %{_datadir}/icons/hicolor/32x32/apps -%dir %{_datadir}/icons/hicolor/48x48 -%dir %{_datadir}/icons/hicolor/48x48/apps -%dir %{_datadir}/icons/hicolor/64x64 -%dir %{_datadir}/icons/hicolor/64x64/apps -%dir %{_datadir}/icons/hicolor/128x128 -%dir %{_datadir}/icons/hicolor/128x128/apps -%{_datadir}/icons/hicolor/*/apps/psi-plus.png %dir %{_datadir}/psi-plus/ %{_datadir}/psi-plus/certs %dir %{_libdir}/psi-plus @@ -672,7 +596,7 @@ %defattr(-,root,root) %{_datadir}/psi-plus/*.qm -%files icons +%files data %defattr(-,root,root) %dir %{iconspath}/ %dir %{iconspath}/activities @@ -699,13 +623,7 @@ %dir %{iconspath}/emoticons %{iconspath}/emoticons/default %{_datadir}/psi-plus/client_icons.txt - -%files sounds -%defattr(-,root,root) %{_datadir}/psi-plus/sound - -%files themes -%defattr(-,root,root) %{_datadir}/psi-plus/themes %files plugins-devel ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Rj4DB4/_old 2017-04-11 09:38:53.738203442 +0200 +++ /var/tmp/diff_new_pack.Rj4DB4/_new 2017-04-11 09:38:53.742202877 +0200 @@ -1,21 +1,21 @@ <services> - <service mode="localonly" name="tar_scm"> + <service mode="disabled" name="tar_scm"> <param name="url">git://github.com/psi-plus/psi-plus-snapshots.git</param> <param name="scm">git</param> <param name="filename">psi+</param> <param name="versionformat">%cd</param> </service> - <service mode="localonly" name="tar_scm"> + <service mode="disabled" name="tar_scm"> <param name="url">git://github.com/psi-plus/psi-plus-l10n.git</param> <param name="scm">git</param> <param name="filename">psi-plus-l10n</param> <param name="version">1</param> </service> - <service mode="localonly" name="recompress"> + <service mode="disabled" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> - <service mode="localonly" name="set_version"> + <service mode="disabled" name="set_version"> <param name="basename">psi+</param> </service> </services> ++++++ psi+-20170212.tar.xz -> psi+-20170321.tar.xz ++++++ /work/SRC/openSUSE:Factory/psi+/psi+-20170212.tar.xz /work/SRC/openSUSE:Factory/.psi+.new/psi+-20170321.tar.xz differ: char 26, line 1 ++++++ psi-plus-l10n-1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psi-plus-l10n-1/translations/psi_it.ts new/psi-plus-l10n-1/translations/psi_it.ts --- old/psi-plus-l10n-1/translations/psi_it.ts 2017-02-13 01:35:24.000000000 +0100 +++ new/psi-plus-l10n-1/translations/psi_it.ts 2017-03-15 20:08:03.000000000 +0100 @@ -577,17 +577,9 @@ <translation>Conserva hash invece di password in chiaro se il server supporta questa funzione.</translation> </message> <message> - <source>Disable</source> - <translation type="vanished">Disabilita</translation> - </message> - <message> <source>Enable Stream Management if possible</source> <translation>Abilita Gestore Flusso se possibile</translation> </message> - <message> - <source>Nested groups delimiter: </source> - <translation type="vanished">Delimitatore gruppi nidificati:</translation> - </message> </context> <context> <name>AccountModifyDlg</name> @@ -2445,13 +2437,6 @@ </message> </context> <context> - <name>ClientStream</name> - <message> - <source>Offered mechanisms: </source> - <translation type="vanished">Meccanismi offerti:</translation> - </message> -</context> -<context> <name>ClientSwitcherPlugin</name> <message> <source>Authors: </source> @@ -3731,14 +3716,14 @@ <context> <name>EnumMessagesPlugin</name> <message> - <source>Missed messages: %1</source> - <translation>Messaggi persi: %1</translation> - </message> - <message> <source>Authors: </source> <translation>Autori:</translation> </message> <message> + <source>Missed messages: %1</source> + <translation>Messaggi persi: %1</translation> + </message> + <message> <source>Enum Messages</source> <translation>Messaggi Enumerati</translation> </message> @@ -4496,7 +4481,7 @@ </message> <message> <source>Store MUC private messages in history</source> - <translation type="unfinished"></translation> + <translation>Memorizza messaggi privati MUC nella cronologia</translation> </message> </context> <context> @@ -6405,6 +6390,26 @@ <context> <name>HttpUploadPlugin</name> <message> + <source>Upload Image</source> + <translation>Carica Immagini</translation> + </message> + <message> + <source>Upload File</source> + <translation>Carica File</translation> + </message> + <message> + <source>Images (*.png *.gif *.jpg *.jpeg)</source> + <translation>Immagini (*.png *.gif *.jpg *.jpeg)</translation> + </message> + <message> + <source>Error</source> + <translation>Errore</translation> + </message> + <message> + <source>Authors: </source> + <translation>Autori:</translation> + </message> + <message> <source>Image preview width</source> <translation>Larghezza anteprima immagine</translation> </message> @@ -6421,14 +6426,6 @@ <translation>Qualità JPEG</translation> </message> <message> - <source>Upload Image</source> - <translation>Carica Immagini</translation> - </message> - <message> - <source>Upload File</source> - <translation>Carica File</translation> - </message> - <message> <source>Please wait</source> <translation>Attendere prego</translation> </message> @@ -6453,14 +6450,6 @@ <translation>Carica immagine</translation> </message> <message> - <source>Images (*.png *.gif *.jpg *.jpeg)</source> - <translation>Immagini (*.png *.gif *.jpg *.jpeg)</translation> - </message> - <message> - <source>Error</source> - <translation>Errore</translation> - </message> - <message> <source>Error opening file %1</source> <translation>Errore apertura file %1</translation> </message> @@ -6473,10 +6462,6 @@ <translation>La dimensione del file deve essere minore di %1 byte</translation> </message> <message> - <source>Authors: </source> - <translation>Autori:</translation> - </message> - <message> <source>This plugin allows uploading images and other files via XEP-0363.</source> <translation>Questo plugin permette il caricamento di immagini e altri gile via XEP-0363.</translation> </message> @@ -6836,6 +6821,10 @@ <context> <name>ImagePreviewPlugin</name> <message> + <source>Author: </source> + <translation>Autore:</translation> + </message> + <message> <source>512 Kb</source> <translation>512 Kb</translation> </message> @@ -6868,10 +6857,6 @@ <translation>Permetti upscale</translation> </message> <message> - <source>Author: </source> - <translation>Autore:</translation> - </message> - <message> <source>This plugin shows the preview image for an image URL. </source> <translation>Questo plugin mostra l'immagine di anteprima per un URL immagine. @@ -7059,12 +7044,6 @@ <translation>Avviso</translation> </message> <message> - <source>You have not published conference information changes. -Are you sure you want to discard them?</source> - <translation>Non hai pubblicato i cambiamenti alle informazioni della conferenza. -Sei sicuro di volerle scartare?</translation> - </message> - <message> <source>You have not published your account information changes. Are you sure you want to discard them?</source> <translation>Non hai pubblicato le modifiche delle informazioni del tuo account, @@ -7083,10 +7062,6 @@ <translation>Successo</translation> </message> <message> - <source>Your conference information has been published.</source> - <translation>Le informazioni della tua conferenza sono stati pubblicati.</translation> - </message> - <message> <source>Your account information has been published.</source> <translation>Le informazioni del tuo account sono state pubblicate.</translation> </message> @@ -7099,12 +7074,6 @@ <translation>Impossibile recuperare le informazioni del tuo account. Forse non le hai ancora inserite.</translation> </message> <message> - <source>Unable to retrieve information about this conference. -Reason: %1</source> - <translation>Impossibile recuperare le informazioni su questa conferenza. -Motivo: %1</translation> - </message> - <message> <source>Unable to retrieve information about this contact. Reason: %1</source> <translation>Impossibile recuperare le informazioni su questo contatto. @@ -7126,6 +7095,22 @@ <source>Status</source> <translation>Stato</translation> </message> + <message> + <source>You have not published conference information changes. +Are you sure you want to discard them?</source> + <translation>Non hai pubblicato i cambiamenti alle informazioni della conferenza. +Sei sicuro di volerle scartare?</translation> + </message> + <message> + <source>Your conference information has been published.</source> + <translation>Le informazioni della tua conferenza sono stati pubblicati.</translation> + </message> + <message> + <source>Unable to retrieve information about this conference. +Reason: %1</source> + <translation>Impossibile recuperare le informazioni su questa conferenza. +Motivo: %1</translation> + </message> </context> <context> <name>InvateDialog</name> @@ -9869,12 +9854,8 @@ <translation>Nome</translation> </message> <message> - <source>Conditions</source> - <translation>Condizioni</translation> - </message> - <message> - <source>Show message if it satisfies the rule</source> - <translation>Mostra messaggio se soddisfa le regole</translation> + <source>Enabled</source> + <translation>Abilita</translation> </message> <message> <source>Color for incomming messages numbers</source> @@ -9893,8 +9874,12 @@ <translation>Disabilitato</translation> </message> <message> - <source>Enabled</source> - <translation>Abilita</translation> + <source>Conditions</source> + <translation>Condizioni</translation> + </message> + <message> + <source>Show message if it satisfies the rule</source> + <translation>Mostra messaggio se soddisfa le regole</translation> </message> </context> <context> @@ -14975,6 +14960,22 @@ <translation>Ultimo Messaggio di Stato</translation> </message> <message> + <source>Never</source> + <translation>Mai</translation> + </message> + <message> + <source>Always</source> + <translation>Sempre</translation> + </message> + <message> + <source>This computer only</source> + <translation>Solo questo computer</translation> + </message> + <message> + <source>Except this computer</source> + <translation>Eccetto questo computer</translation> + </message> + <message> <source>Private keys for account "%1" need to be generated. This takes quite some time (from a few seconds to a couple of minutes), and while you can use Psi+ in the meantime, all the messages will be sent unencrypted until keys are generated. You will be notified when this process finishes. Do you want to generate keys now?</source> @@ -14991,22 +14992,6 @@ %2 Grazie per la tua pazienza.</translation> </message> - <message> - <source>Never</source> - <translation>Mai</translation> - </message> - <message> - <source>Always</source> - <translation>Sempre</translation> - </message> - <message> - <source>This computer only</source> - <translation>Solo questo computer</translation> - </message> - <message> - <source>Except this computer</source> - <translation>Eccetto questo computer</translation> - </message> </context> <context> <name>QipXStatuses</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psi-plus-l10n-1/translations/psi_uk.ts new/psi-plus-l10n-1/translations/psi_uk.ts --- old/psi-plus-l10n-1/translations/psi_uk.ts 2017-02-13 01:35:24.000000000 +0100 +++ new/psi-plus-l10n-1/translations/psi_uk.ts 2017-03-15 20:08:03.000000000 +0100 @@ -577,17 +577,9 @@ <translation>Зберігати хеш замість текстового пароля, якщо сервер підтримує цю функцію.</translation> </message> <message> - <source>Disable</source> - <translation type="vanished">Відключити</translation> - </message> - <message> <source>Enable Stream Management if possible</source> <translation>Увімкнути Менеджмент Потоку якщо це можливо</translation> </message> - <message> - <source>Nested groups delimiter: </source> - <translation type="vanished">Розділювач вкладених груп: </translation> - </message> </context> <context> <name>AccountModifyDlg</name> @@ -2450,13 +2442,6 @@ </message> </context> <context> - <name>ClientStream</name> - <message> - <source>Offered mechanisms: </source> - <translation type="vanished">Пропоновані механізми: </translation> - </message> -</context> -<context> <name>ClientSwitcherPlugin</name> <message> <source>Authors: </source> @@ -3736,14 +3721,14 @@ <context> <name>EnumMessagesPlugin</name> <message> - <source>Missed messages: %1</source> - <translation>Пропущені повідомлення: %1</translation> - </message> - <message> <source>Authors: </source> <translation>Автори:</translation> </message> <message> + <source>Missed messages: %1</source> + <translation>Пропущені повідомлення: %1</translation> + </message> + <message> <source>Enum Messages</source> <translation>Підраховані повідомлення</translation> </message> @@ -4499,7 +4484,7 @@ </message> <message> <source>Store MUC private messages in history</source> - <translation type="unfinished"></translation> + <translation>Зберігати історію приватних повідомлень у конференціях</translation> </message> </context> <context> @@ -6409,6 +6394,26 @@ <context> <name>HttpUploadPlugin</name> <message> + <source>Upload Image</source> + <translation>Завантажити зображення</translation> + </message> + <message> + <source>Upload File</source> + <translation>Завантажити файл</translation> + </message> + <message> + <source>Images (*.png *.gif *.jpg *.jpeg)</source> + <translation>Зображення (*.png *.gif *.jpg *.jpeg)</translation> + </message> + <message> + <source>Error</source> + <translation>Помилка</translation> + </message> + <message> + <source>Authors: </source> + <translation>Автори:</translation> + </message> + <message> <source>Image preview width</source> <translation>Ширина зображення попереднього перегляду</translation> </message> @@ -6425,14 +6430,6 @@ <translation>JPEG якість</translation> </message> <message> - <source>Upload Image</source> - <translation>Завантажити зображення</translation> - </message> - <message> - <source>Upload File</source> - <translation>Завантажити файл</translation> - </message> - <message> <source>Please wait</source> <translation>Зачекайте</translation> </message> @@ -6457,14 +6454,6 @@ <translation>Завантажити зображення</translation> </message> <message> - <source>Images (*.png *.gif *.jpg *.jpeg)</source> - <translation>Зображення (*.png *.gif *.jpg *.jpeg)</translation> - </message> - <message> - <source>Error</source> - <translation>Помилка</translation> - </message> - <message> <source>Error opening file %1</source> <translation>Помилка відкриття файлу %1</translation> </message> @@ -6477,10 +6466,6 @@ <translation>Файл мусить бути меншим за %1 байт</translation> </message> <message> - <source>Authors: </source> - <translation>Автори:</translation> - </message> - <message> <source>This plugin allows uploading images and other files via XEP-0363.</source> <translation>Цей плагин дозволяє завантажувати зображення та інші файли за допомогою XEP-0363.</translation> </message> @@ -6840,6 +6825,10 @@ <context> <name>ImagePreviewPlugin</name> <message> + <source>Author: </source> + <translation>Автор:</translation> + </message> + <message> <source>512 Kb</source> <translation>512 Кб</translation> </message> @@ -6872,10 +6861,6 @@ <translation>Дозволити збільшення</translation> </message> <message> - <source>Author: </source> - <translation>Автор:</translation> - </message> - <message> <source>This plugin shows the preview image for an image URL. </source> <translation>Цей плагин показує попередній перегляд зображення для URL з зображенням. @@ -7063,12 +7048,6 @@ <translation>Попередження</translation> </message> <message> - <source>You have not published conference information changes. -Are you sure you want to discard them?</source> - <translation>Ви не опублікували зміни інформації про конференцію. -Ви впевнені, що хочете позбутися їх?</translation> - </message> - <message> <source>You have not published your account information changes. Are you sure you want to discard them?</source> <translation>Ви не опублікували зміни вашого аккаунту. @@ -7087,10 +7066,6 @@ <translation>Успішно</translation> </message> <message> - <source>Your conference information has been published.</source> - <translation>Ваша інформація конференції була опублікована.</translation> - </message> - <message> <source>Your account information has been published.</source> <translation>Ваша інформація про аккаунт була опублікована.</translation> </message> @@ -7103,12 +7078,6 @@ <translation>Неможливо отримати інформацію по вашому аккаунту. Можливо, ви ще нічого не вказали.</translation> </message> <message> - <source>Unable to retrieve information about this conference. -Reason: %1</source> - <translation>Неможливо отримати інформацію по цій конференції. -Причина: %1</translation> - </message> - <message> <source>Unable to retrieve information about this contact. Reason: %1</source> <translation>Неможливо отримати інформацію по цьому аккаунту. @@ -7130,6 +7099,22 @@ <source>Status</source> <translation>Статус</translation> </message> + <message> + <source>You have not published conference information changes. +Are you sure you want to discard them?</source> + <translation>Ви не опублікували зміни інформації про конференцію. +Ви впевнені, що хочете позбутися їх?</translation> + </message> + <message> + <source>Your conference information has been published.</source> + <translation>Ваша інформація конференції була опублікована.</translation> + </message> + <message> + <source>Unable to retrieve information about this conference. +Reason: %1</source> + <translation>Неможливо отримати інформацію по цій конференції. +Причина: %1</translation> + </message> </context> <context> <name>InvateDialog</name> @@ -9872,12 +9857,8 @@ <translation>Ім'я</translation> </message> <message> - <source>Conditions</source> - <translation>Умови</translation> - </message> - <message> - <source>Show message if it satisfies the rule</source> - <translation>Показати повідомлення, якщо воно задовольняє правилу</translation> + <source>Enabled</source> + <translation>Увімкнено</translation> </message> <message> <source>Color for incomming messages numbers</source> @@ -9896,8 +9877,12 @@ <translation>Вимкнено</translation> </message> <message> - <source>Enabled</source> - <translation>Увімкнено</translation> + <source>Conditions</source> + <translation>Умови</translation> + </message> + <message> + <source>Show message if it satisfies the rule</source> + <translation>Показати повідомлення, якщо воно задовольняє правилу</translation> </message> </context> <context> @@ -14982,6 +14967,22 @@ <translation>Останнє статусне повідомлення</translation> </message> <message> + <source>Never</source> + <translation>Ніколи</translation> + </message> + <message> + <source>Always</source> + <translation>Завжди</translation> + </message> + <message> + <source>This computer only</source> + <translation>Тільки цей комп'ютер</translation> + </message> + <message> + <source>Except this computer</source> + <translation>Крім цього комп'ютера</translation> + </message> + <message> <source>Private keys for account "%1" need to be generated. This takes quite some time (from a few seconds to a couple of minutes), and while you can use Psi+ in the meantime, all the messages will be sent unencrypted until keys are generated. You will be notified when this process finishes. Do you want to generate keys now?</source> @@ -14999,22 +15000,6 @@ Дякуємо за терпіння.</translation> </message> - <message> - <source>Never</source> - <translation>Ніколи</translation> - </message> - <message> - <source>Always</source> - <translation>Завжди</translation> - </message> - <message> - <source>This computer only</source> - <translation>Тільки цей комп'ютер</translation> - </message> - <message> - <source>Except this computer</source> - <translation>Крім цього комп'ютера</translation> - </message> </context> <context> <name>QipXStatuses</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/psi-plus-l10n-1/translations/psi_zh_CN.ts new/psi-plus-l10n-1/translations/psi_zh_CN.ts --- old/psi-plus-l10n-1/translations/psi_zh_CN.ts 2017-02-13 01:35:24.000000000 +0100 +++ new/psi-plus-l10n-1/translations/psi_zh_CN.ts 2017-03-15 20:08:03.000000000 +0100 @@ -5,7 +5,7 @@ <name>@default</name> <message> <source>language_name</source> - <translation>中文简体(中华人民共和国)</translation> + <translation>英语</translation> </message> </context> <context> @@ -57,9 +57,7 @@ <br> Copyright © 2001-2014 The Psi Team.<br> </source> - <translation type="unfinished">为高端用户设计的跨平台 XMPP 客户端.<br> -<br> -Copyright © 2001-2013 The Psi Team.<br> {2001-2014 ?}</translation> + <translation type="unfinished"></translation> </message> <message> <source>http://psi-im.org</source> @@ -576,10 +574,6 @@ <translation>若服务器支持，则保存密码特征值(hash)，而不保存明文.</translation> </message> <message> - <source>Disable</source> - <translation type="obsolete">禁用</translation> - </message> - <message> <source>Enable Stream Management if possible</source> <translation type="unfinished"></translation> </message> @@ -1531,19 +1525,19 @@ <name>BattleshipGamePlugin</name> <message> <source>Choose a sound file</source> - <translation type="unfinished"></translation> + <translation>选择一个音频文件</translation> </message> <message> <source>Sound (*.wav)</source> - <translation type="unfinished"></translation> + <translation>音频文件 (*.wav)</translation> </message> <message> <source>Author: </source> - <translation type="unfinished"></translation> + <translation>作者:</translation> </message> <message> <source>Email: </source> - <translation type="unfinished"></translation> + <translation>电子邮箱:</translation> </message> <message> <source>This plugin allows you to play battleship with your friends. @@ -1552,11 +1546,11 @@ </message> <message> <source>Battleship game</source> - <translation type="unfinished"></translation> + <translation>战舰游戏</translation> </message> <message> <source>Battleship game!</source> - <translation type="unfinished"></translation> + <translation>战舰游戏!</translation> </message> </context> <context> @@ -1599,7 +1593,7 @@ </message> <message> <source>Auto-join:</source> - <translation type="unfinished"></translation> + <translation>自动加入:</translation> </message> </context> <context> @@ -1724,11 +1718,11 @@ </message> <message> <source>Call is ended</source> - <translation type="unfinished"></translation> + <translation>已结束呼叫</translation> </message> <message> <source>Call duration: %1</source> - <translation type="unfinished"></translation> + <translation>通话时长: %1</translation> </message> </context> <context> @@ -1750,7 +1744,7 @@ <name>CaptchaDlg</name> <message> <source>Dialog</source> - <translation type="unfinished">对话</translation> + <translation>对话</translation> </message> </context> <context> @@ -2429,13 +2423,6 @@ </message> </context> <context> - <name>ClientStream</name> - <message> - <source>Offered mechanisms: </source> - <translation type="obsolete">提供的机制:</translation> - </message> -</context> -<context> <name>ClientSwitcherPlugin</name> <message> <source>Authors: </source> @@ -2457,7 +2444,7 @@ <name>CloseButton</name> <message> <source>Close Tab</source> - <translation type="unfinished">关闭标签</translation> + <translation>关闭标签</translation> </message> </context> <context> @@ -3290,30 +3277,30 @@ <name>Crash::CrashDialog</name> <message> <source>Crash handler log</source> - <translation type="unfinished"></translation> + <translation>清除句柄日志</translation> </message> </context> <context> <name>CreateGroupDlg</name> <message> <source>Create New Group</source> - <translation type="unfinished">建立新群组</translation> + <translation>建立新群组</translation> </message> <message> <source>Enter the new group name:</source> - <translation type="unfinished">输入新群组的名称:</translation> + <translation>输入新群组的名称:</translation> </message> <message> - <source><None></source> - <translation type="unfinished"><无></translation> + <source>Add</source> + <translation>增加</translation> </message> <message> - <source>Choose parent group: </source> - <translation type="unfinished"></translation> + <source><None></source> + <translation><无></translation> </message> <message> - <source>Add</source> - <translation type="unfinished"></translation> + <source>Choose parent group: </source> + <translation>选择父群组:</translation> </message> </context> <context> @@ -3712,7 +3699,7 @@ <name>EnumMessagesPlugin</name> <message> <source>Authors: </source> - <translation type="unfinished">作者:</translation> + <translation>作者:</translation> </message> <message> <source>Missed messages: %1</source> @@ -6174,6 +6161,10 @@ <translation type="unfinished">退出、出口</translation> </message> <message> + <source>Import</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Error</source> <translation type="unfinished">错误</translation> </message> @@ -6190,10 +6181,6 @@ <source>Counting records</source> <translation type="unfinished"></translation> </message> - <message> - <source>Import</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>HistoryKeeperPlugin</name> @@ -6843,6 +6830,10 @@ <context> <name>ImagePreviewPlugin</name> <message> + <source>Author: </source> + <translation type="unfinished"></translation> + </message> + <message> <source>512 Kb</source> <translation type="unfinished"></translation> </message> @@ -6875,10 +6866,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Author: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>This plugin shows the preview image for an image URL. </source> <translation type="unfinished"></translation> @@ -7003,26 +6990,26 @@ </message> <message> <source>psi/disco</source> - <translation type="unfinished">psi/迪斯科</translation> + <translation type="unfinished"></translation> </message> <message> <source>&Publish</source> - <translation type="unfinished">发布(&P)</translation> + <translation type="unfinished"></translation> </message> <message> <source>&Retrieve</source> - <translation type="unfinished">取回(&R)</translation> + <translation type="unfinished"></translation> </message> <message> <source>psi/reload</source> - <translation type="unfinished">psi/再装</translation> + <translation type="unfinished"></translation> </message> <message> - <source>psi/close</source> - <translation type="unfinished">psi/关闭</translation> + <source>&Close</source> + <translation type="unfinished"></translation> </message> <message> - <source>&Close</source> + <source>psi/close</source> <translation type="unfinished"></translation> </message> </context> @@ -7030,23 +7017,23 @@ <name>InfoWidget</name> <message> <source>First Name:</source> - <translation type="unfinished">名:</translation> + <translation type="unfinished"></translation> </message> <message> <source>Middle Name:</source> - <translation type="unfinished">中间名:</translation> + <translation type="unfinished"></translation> </message> <message> <source>Last Name:</source> - <translation type="unfinished">姓:</translation> + <translation type="unfinished"></translation> </message> <message> <source>Edit names</source> - <translation type="unfinished">编辑名字</translation> + <translation type="unfinished"></translation> </message> <message> <source>View names</source> - <translation type="unfinished">视图的名称</translation> + <translation type="unfinished"></translation> </message> <message> <source>Open web browser</source> @@ -7054,11 +7041,11 @@ </message> <message> <source>No date</source> - <translation type="unfinished">没有日期</translation> + <translation type="unfinished"></translation> </message> <message> <source>Edit birthday</source> - <translation type="unfinished">编辑生日</translation> + <translation type="unfinished"></translation> </message> <message> <source>Warning</source> @@ -7067,16 +7054,15 @@ <message> <source>You have not published your account information changes. Are you sure you want to discard them?</source> - <translation type="unfinished">你还没有发布你的账号数据变更。 -你确定要忽视它们吗?</translation> + <translation type="unfinished"></translation> </message> <message> <source>Close and discard</source> - <translation type="unfinished">关闭并忽视</translation> + <translation type="unfinished"></translation> </message> <message> <source>Don't close</source> - <translation type="unfinished">不要关闭</translation> + <translation type="unfinished"></translation> </message> <message> <source>Success</source> @@ -7084,7 +7070,7 @@ </message> <message> <source>Your account information has been published.</source> - <translation type="unfinished">你的账号数据已经发布了。</translation> + <translation type="unfinished"></translation> </message> <message> <source>Error</source> @@ -7092,24 +7078,22 @@ </message> <message> <source>Unable to retrieve your account information. Perhaps you haven't entered any yet.</source> - <translation type="unfinished">无法取回你的账号数据。 可能你还没有输入东西吧。</translation> + <translation type="unfinished"></translation> </message> <message> <source>Unable to retrieve information about this contact. Reason: %1</source> - <translation type="unfinished">无法检索有关此联系人的信息。 -原因:%1</translation> + <translation type="unfinished"></translation> </message> <message> <source>Unable to publish your account information. Reason: %1</source> - <translation type="unfinished">无法发布您的帐户信息。 -原因:%1</translation> + <translation type="unfinished"></translation> </message> <message> <source>Picture not available</source> - <translation type="unfinished">图片不可用</translation> + <translation type="unfinished"></translation> </message> <message> <source>Status</source> @@ -7959,13 +7943,13 @@ <context> <name>MessageFilter</name> <message> - <source>e-mail: </source> - <translation type="unfinished">电子邮箱:</translation> - </message> - <message> <source>Author: </source> <translation type="unfinished"></translation> </message> + <message> + <source>e-mail: </source> + <translation type="unfinished">电子邮箱:</translation> + </message> </context> <context> <name>MiniClient</name> @@ -11218,7 +11202,7 @@ </message> <message> <source>Battleship game</source> - <translation type="unfinished"></translation> + <translation type="unfinished">战舰游戏</translation> </message> <message> <source>Freeze ships position</source>
