Hello community, here is the log from the commit of package kio-gdrive for openSUSE:Factory checked in at 2018-04-01 17:27:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kio-gdrive (Old) and /work/SRC/openSUSE:Factory/.kio-gdrive.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kio-gdrive" Sun Apr 1 17:27:50 2018 rev:9 rq:592843 version:1.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kio-gdrive/kio-gdrive.changes 2018-02-14 14:19:00.196312513 +0100 +++ /work/SRC/openSUSE:Factory/.kio-gdrive.new/kio-gdrive.changes 2018-04-01 17:27:53.688548068 +0200 @@ -1,0 +2,10 @@ +Sun Apr 1 06:39:33 UTC 2018 - [email protected] + +- Update to 1.2.2 + * Fixed mimetype used to open .ods files (kde#388598) + * Fixed copy of files within the same gdrive account (kde#376735) + * Updated translations +- Drop 0001-MIME-type-correction-for-ods-files.patch, merged + upstream + +------------------------------------------------------------------- Old: ---- 0001-MIME-type-correction-for-ods-files.patch kio-gdrive-1.2.1.tar.xz New: ---- kio-gdrive-1.2.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kio-gdrive.spec ++++++ --- /var/tmp/diff_new_pack.VG3k2H/_old 2018-04-01 17:27:55.296489870 +0200 +++ /var/tmp/diff_new_pack.VG3k2H/_new 2018-04-01 17:27:55.300489726 +0200 @@ -18,15 +18,13 @@ %bcond_without lang Name: kio-gdrive -Version: 1.2.1 +Version: 1.2.2 Release: 0 Summary: Google Drive KIO slave for KDE applications License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.xz -# FIX-PATCH-UPSTREAM Fixed in 1.2.2 -Patch0: 0001-MIME-type-correction-for-ods-files.patch BuildRequires: extra-cmake-modules BuildRequires: intltool BuildRequires: kaccounts-integration-devel @@ -54,7 +52,6 @@ %prep %setup -q -%patch0 -p1 %build %cmake_kf5 -d build ++++++ kio-gdrive-1.2.1.tar.xz -> kio-gdrive-1.2.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/CMakeLists.txt new/kio-gdrive-1.2.2/CMakeLists.txt --- old/kio-gdrive-1.2.1/CMakeLists.txt 2017-09-30 17:29:04.000000000 +0200 +++ new/kio-gdrive-1.2.2/CMakeLists.txt 2018-03-30 11:21:22.000000000 +0200 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.0) -set(GDRIVE_VERSION 1.2.1) +set(GDRIVE_VERSION 1.2.2) project(kio-gdrive VERSION ${GDRIVE_VERSION}) set(QT_MIN_VERSION 5.2.0) @@ -80,5 +80,7 @@ find_package(KF5I18n CONFIG REQUIRED) ki18n_install(po) -find_package(KF5DocTools CONFIG REQUIRED) -kdoctools_install(po) + find_package(KF5DocTools CONFIG) + if(KF5DocTools_FOUND) + kdoctools_install(po) + endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/Messages.sh new/kio-gdrive-1.2.2/Messages.sh --- old/kio-gdrive-1.2.1/Messages.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kio-gdrive-1.2.2/Messages.sh 2018-03-30 11:20:26.000000000 +0200 @@ -0,0 +1,3 @@ +#! /usr/bin/env bash + +$XGETTEXT $(find . -name "*.cpp") -o $podir/kio5_gdrive.pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/desktop/gdrive-network.desktop new/kio-gdrive-1.2.2/desktop/gdrive-network.desktop --- old/kio-gdrive-1.2.1/desktop/gdrive-network.desktop 2017-09-30 17:28:11.000000000 +0200 +++ new/kio-gdrive-1.2.2/desktop/gdrive-network.desktop 2018-03-30 11:20:26.000000000 +0200 @@ -14,10 +14,12 @@ Name[pl]=Dysk Google Name[pt]=Google Drive Name[pt_BR]=Google Drive +Name[ru]=Диск Google Name[sk]=Google Drive Name[sv]=Google Drive Name[uk]=Google Диск Name[x-test]=xxGoogle Drivexx +Name[zh_CN]=Google 云端硬盘 Name[zh_TW]=Google 雲端硬碟 Type=Link URL=gdrive:/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/desktop/org.kde.kio-gdrive.appdata.xml new/kio-gdrive-1.2.2/desktop/org.kde.kio-gdrive.appdata.xml --- old/kio-gdrive-1.2.1/desktop/org.kde.kio-gdrive.appdata.xml 2017-09-30 17:28:11.000000000 +0200 +++ new/kio-gdrive-1.2.2/desktop/org.kde.kio-gdrive.appdata.xml 2018-03-30 11:20:26.000000000 +0200 @@ -7,26 +7,33 @@ <name xml:lang="ca">KIO GDrive</name> <name xml:lang="ca-valencia">KIO GDrive</name> <name xml:lang="cs">KIO GDrive</name> + <name xml:lang="de">KIO GDrive</name> <name xml:lang="en-GB">KIO GDrive</name> <name xml:lang="es">KIO GDrive</name> <name xml:lang="it">KIO GDrive</name> <name xml:lang="nl">KIO GDrive</name> <name xml:lang="pl">KIO GDrive</name> <name xml:lang="pt">KIO GDrive</name> + <name xml:lang="pt-BR">KIO GDrive</name> + <name xml:lang="ru">KIO для поддержки Диска Google</name> <name xml:lang="sk">KIO GDrive</name> <name xml:lang="sv">KIO Gdrive</name> <name xml:lang="uk">KIO GDrive</name> <name xml:lang="x-test">xxKIO GDrivexx</name> + <name xml:lang="zh-CN">KIO GDrive</name> <summary>Google Drive integration with KDE Plasma and KDE applications</summary> <summary xml:lang="ca">Integració del Drive de Google amb el Plasma del KDE i les aplicacions KDE</summary> <summary xml:lang="ca-valencia">Integració del Drive de Google amb el Plasma del KDE i les aplicacions KDE</summary> <summary xml:lang="cs">Integrace Google Drive do KDE Plasma a aplikací KDE</summary> + <summary xml:lang="de">Integration von Google Drive mit Plasma und den KDE-Anwendungen</summary> <summary xml:lang="en-GB">Google Drive integration with KDE Plasma and KDE applications</summary> <summary xml:lang="es">Integración de Google Drive con Plasma y aplicaciones de KDE</summary> <summary xml:lang="it">Integrazione di Google Drive con le applicazioni di KDE e KDE Plasma</summary> <summary xml:lang="nl">Integratie van Google Drive met KDE Plasma en KDE applications</summary> <summary xml:lang="pl">Integracja Dysku Google z KDE Plazmą i aplikacjami KDE</summary> <summary xml:lang="pt">Integração do Google Drive com o Plasma e as aplicações do KDE</summary> + <summary xml:lang="pt-BR">Integração do Google Drive com o KDE Plasma e aplicativos do KDE</summary> + <summary xml:lang="ru">Интеграция Диска Google с KDE Plasma и приложениями от KDE</summary> <summary xml:lang="sk">Integrácia Google disku s KDE Plasma a KDE aplikáciami</summary> <summary xml:lang="sv">Integrering av Google Drive med KDE Plasma och KDE-program</summary> <summary xml:lang="uk">Інтеграція Диска Google із Плазмою KDE та програмами KDE</summary> @@ -35,12 +42,14 @@ <p>KIO GDrive is a KIO slave that enables KIO-aware applications (such as Dolphin, Kate or Gwenview) to access and edit Google Drive files on the cloud.</p> <p xml:lang="ca">El KIO GDrive és un esclau del KIO que habilita les aplicacions preparades per al KIO (com el Dolphin, el Kate o el Gwenview) per accedir i editar fitxers del Drive de Google en el núvol.</p> <p xml:lang="ca-valencia">El KIO GDrive és un esclau del KIO que habilita les aplicacions preparades per al KIO (com el Dolphin, el Kate o el Gwenview) per accedir i editar fitxers del Drive de Google en el núvol.</p> + <p xml:lang="de">KIO GDrive ist ein Ein-/Ausgabemodul, mit dem Anwendungen wie Dolphin, Kate oder Gwenview auf Dateien in der Cloud Google Drive zugreifen und bearbeiten können.</p> <p xml:lang="en-GB">KIO GDrive is a KIO slave that enables KIO-aware applications (such as Dolphin, Kate or Gwenview) to access and edit Google Drive files on the cloud.</p> <p xml:lang="es">KIO GDrive es un esclavo KIO que permite que aplicaciones KIO-compatibles (como Dolphin, Kate o Gwenview) acceder y editar archivos de Google Drive en la nube.</p> <p xml:lang="it">KIO GDrive è un KIO slave che consente alle applicazioni che gestiscono KIO (come Dolphin, Kate o Gwenview) di accedere e modificare i file di Google Drive sul cloud.</p> <p xml:lang="nl">KIO GDrive is een KIO-slave die met KIO bekende toepassingen (zoals Dolphin, Kate of Gwenview) toegang geeft tot bestanden en deze bewerkt op Google Drive in de cloud.</p> <p xml:lang="pl">KIO GDrive jest KIO slave, który umożliwia aplikacjom świadomym KIO (takim jak Dolphin, Kate lub Gwenview) na dostęp i edycję plików w chmurze Dysku Google.</p> <p xml:lang="pt">O KIO GDrive é um KIO slave que permite às aplicações que suportam o KIO (como o Dolphin, o Kate ou o Gwenview) aceder e editar ficheiros do Google Drive na 'cloud'.</p> + <p xml:lang="pt-BR">O KIO GDrive é um KIO slave que permite a aplicativos com suporte a KIO (como Dolphin, Kate ou Gwenview) acessar e editar arquivos do Google Drive na nuvem.</p> <p xml:lang="sk">KIO GDrive je KIO slave, ktorý umožní KIO-aware aplikáciám (ako Dolphin, Kate alebo Gwenview) pristupovať a upravovať súbory Google disku na cloude.</p> <p xml:lang="sv">KIO GDrive är en I/O-slav som gör det möjligt för program medvetna om KIO (såsom Dolphin, Kate eller Gwenview) att komma åt och redigera Google Drive-filer i molnet.</p> <p xml:lang="uk">KIO GDrive — допоміжний засіб введення-виведення даних, який уможливлює для програм із підтримкою KIO (зокрема Dolphin, Kate та Gwenview) доступ та редагування даних файлів на Диску Google у обчислювальній «хмарі».</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/kaccounts/gdrive.notifyrc new/kio-gdrive-1.2.2/kaccounts/gdrive.notifyrc --- old/kio-gdrive-1.2.1/kaccounts/gdrive.notifyrc 2017-09-30 17:28:11.000000000 +0200 +++ new/kio-gdrive-1.2.2/kaccounts/gdrive.notifyrc 2018-03-30 11:20:26.000000000 +0200 @@ -12,10 +12,13 @@ Comment[nl]=KIO GDrive Comment[pl]=KIO GDrive Comment[pt]=KIO GDrive +Comment[pt_BR]=KIO GDrive +Comment[ru]=KIO для поддержки Диска Google Comment[sk]=KIO GDrive Comment[sv]=KIO Gdrive Comment[uk]=KIO GDrive Comment[x-test]=xxKIO GDrivexx +Comment[zh_CN]=KIO GDrive [Event/new-account-added] Name=New Account Added @@ -30,22 +33,28 @@ Name[nl]=Nieuw account toegevoegd Name[pl]=Dodano nowe konto Name[pt]=Nova Conta Adicionada +Name[pt_BR]=Nova conta adicionada +Name[ru]=Добавлена учётная запись Name[sk]=Nový účet pridaný Name[sv]=Nytt konto tillagt Name[uk]=Додано новий обліковий запис Name[x-test]=xxNew Account Addedxx +Name[zh_CN]=新帐户已添加 Comment= Shortcut to browse Google Drive files as soon as a new Google account has been added. -Comment[ca]=Drecera per explorar els fitxers de Google Drive tant aviat com s'afegeixi un compte nou de Google. -Comment[ca@valencia]=Drecera per explorar els fitxers de Google Drive tant prompte com s'afija un compte nou de Google. +Comment[ca]=Drecera per explorar els fitxers de Google Drive tan aviat com s'afegeixi un compte nou de Google. +Comment[ca@valencia]=Drecera per explorar els fitxers de Google Drive tan prompte com s'afija un compte nou de Google. Comment[da]=Genvej til at gennemse Google Drev-filer så snart en ny Google-konto er blevet tilføjet. +Comment[de]=Kurzbefehl zum Durchsuchen von Dateien auf Google Drive, sobald ein neuer Zugang für Google hinzugefügt wurde. Comment[en_GB]= Shortcut to browse Google Drive files as soon as a new Google account has been added. Comment[es]=Acceso directo para navegar por archivos Google Drive tan pronto como se añada una cuenta de Google. Comment[it]= Scorciatoia per navigare tra i file di Google Drive dopo che è stato aggiunto un nuovo account di Google. Comment[nl]= Sneltoets om door Google Drive bestanden te bladeren zodra een nieuw Google account is toegevoegd. Comment[pl]=Skrót do przeglądania Dysku Google od razu po dodaniu konta Google. Comment[pt]=Um atalho para navegar pelos ficheiros do Google Drive, assim que tiver sido adicionada uma conta da Google. +Comment[pt_BR]=Atalho para navegar nos arquivos do Google Drive tão logo uma conta Google for adicionada. Comment[sk]= Skratka na prehliadanie súborov Google disk hneď, ako sa pridá účet Google. Comment[sv]= Genväg för att bläddra i Google Drive-filer så snart ett nytt Google-konto har lagts till. Comment[uk]=Кнопка для перегляду файлів Google Диск після додавання нового облікового запису Google. Comment[x-test]=xx Shortcut to browse Google Drive files as soon as a new Google account has been added.xx +Comment[zh_CN]= 浏览 Google 云端硬盘的文件的快捷方式，只要 Google 账号被添加即可使用。 Action=Popup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/ca/kio5_gdrive.po new/kio-gdrive-1.2.2/po/ca/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/ca/kio5_gdrive.po 2017-09-30 17:28:29.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/ca/kio5_gdrive.po 2018-03-30 11:20:54.000000000 +0200 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: kio5_gdrive\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" -"PO-Revision-Date: 2017-05-07 15:48+0100\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" +"PO-Revision-Date: 2017-11-23 22:43+0100\n" "Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca\n" @@ -21,14 +21,34 @@ "X-Accelerator-Marker: &\n" "X-Generator: Lokalize 2.0\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, kde-format +msgid "New Online Account" +msgstr "Compte nou en línia" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" +"Ara podeu gestionar els fitxers del Google Drive del vostre compte <emphasis " +"strong='true'>%1</emphasis>." + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "Obre" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "" "No hi ha cap compte actiu de Google Drive. Si us plau, afegiu-ne un com a " "mínim." -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/ca@valencia/kio5_gdrive.po new/kio-gdrive-1.2.2/po/ca@valencia/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/ca@valencia/kio5_gdrive.po 2017-09-30 17:28:29.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/ca@valencia/kio5_gdrive.po 2018-03-30 11:20:54.000000000 +0200 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: kio5_gdrive\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" -"PO-Revision-Date: 2017-05-07 15:48+0100\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" +"PO-Revision-Date: 2017-11-23 22:43+0100\n" "Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" @@ -21,14 +21,34 @@ "X-Accelerator-Marker: &\n" "X-Generator: Lokalize 2.0\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, kde-format +msgid "New Online Account" +msgstr "Compte nou en línia" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" +"Ara podeu gestionar els fitxers del Google Drive del vostre compte <emphasis " +"strong='true'>%1</emphasis>." + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "Obri" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "" "No hi ha cap compte actiu de Google Drive. Per favor, afegiu-ne un com a " "mínim." -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/cs/kio5_gdrive.po new/kio-gdrive-1.2.2/po/cs/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/cs/kio5_gdrive.po 2017-09-30 17:28:29.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/cs/kio5_gdrive.po 2018-03-30 11:20:54.000000000 +0200 @@ -6,9 +6,9 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" -"PO-Revision-Date: 2016-08-16 09:26+0100\n" -"Last-Translator: Vít Pelčák <[email protected]>\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" +"PO-Revision-Date: 2017-11-30 09:44+0100\n" +"Last-Translator: Vit Pelcak <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" "Language: cs\n" "MIME-Version: 1.0\n" @@ -17,12 +17,30 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Lokalize 2.0\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, kde-format +msgid "New Online Account" +msgstr "Nový účet online" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "Otevřít" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "" -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/da/kio5_gdrive.po new/kio-gdrive-1.2.2/po/da/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/da/kio5_gdrive.po 2017-09-30 17:28:30.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/da/kio5_gdrive.po 2018-03-30 11:20:55.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" "PO-Revision-Date: 2017-07-23 12:57+0100\n" "Last-Translator: Martin Schlander <[email protected]>\n" "Language-Team: Danish <[email protected]>\n" @@ -17,12 +17,32 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, fuzzy, kde-format +#| msgctxt "login in a new google account" +#| msgid "New account" +msgid "New Online Account" +msgstr "Ny konto" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "Der er ingen Google Drev-konti aktiveret. Tilføj venligst mindst en." -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/de/docs/kioslave5/gdrive/index.docbook new/kio-gdrive-1.2.2/po/de/docs/kioslave5/gdrive/index.docbook --- old/kio-gdrive-1.2.1/po/de/docs/kioslave5/gdrive/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ new/kio-gdrive-1.2.2/po/de/docs/kioslave5/gdrive/index.docbook 2018-03-30 11:21:13.000000000 +0200 @@ -0,0 +1,81 @@ +<?xml version="1.0" ?> +<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ +<!ENTITY % addindex "IGNORE"> +<!ENTITY % German "INCLUDE"> +]> + +<article lang="&language;" id="gdrive"> +<title +>gdrive</title> + +<articleinfo> + +<authorgroup> + <author +><firstname +>Elvis</firstname +><surname +>Angelaccio</surname +> <affiliation +> <address +> <email +>[email protected]</email> + </address> + </affiliation> + </author> +<othercredit role="translator" +><firstname +>Burkhard</firstname +><surname +>Lück</surname +><affiliation +><address +><email +>[email protected]</email +></address +></affiliation +><contrib +>Übersetzung</contrib +></othercredit +> +</authorgroup> + +<date +>2016-10-03</date> +<releaseinfo +>kio-gdrive 1.0.1</releaseinfo> + +</articleinfo> + +<para +>Mit KIO GDrive haben Sie mit allen KDE-Anwendungen, die Ein-Ausgabemodule verwenden, Zugriff auf Ihre Dateien auf Google Drive und können Sie bearbeiten.</para> + +<para +>Nutzen Sie das Ein-/Ausgabemodul „gdrive“ folgendermaßen:</para> +<para +><userinput +>gdrive://</userinput +> oder <userinput +>gdrive://<replaceable +>[email protected]</replaceable +></userinput +>.</para> + +<para +>Mit der ersten URL wird ein OAuth-Anmeldungsdialog von Google angezeigt, wenn noch kein Zugang zu Google Drive eingerichtet wurde, ansonsten werden statt dessen alle vorhandenen Zugänge angezeigt.</para> + +<para +>Die URL <userinput +>gdrive://</userinput +> kann außerdem benutzt werden, um jederzeit einen zusätzlichen Zugang hinzuzufügen.</para> + +<para +>Mit der URL <userinput +>gdrive://<replaceable +>[email protected]</replaceable +></userinput +> werden alle Dateien und Ordner auf der obersten Ebene des Drive-Zugangs <userinput +>[email protected]</userinput +>.</para> + +</article> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/de/kio5_gdrive.po new/kio-gdrive-1.2.2/po/de/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/de/kio5_gdrive.po 2017-09-30 17:28:30.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/de/kio5_gdrive.po 2018-03-30 11:20:55.000000000 +0200 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" -"PO-Revision-Date: 2017-06-22 15:09+0100\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" +"PO-Revision-Date: 2017-11-26 21:23+0100\n" "Last-Translator: Burkhard Lück <[email protected]>\n" "Language-Team: German <[email protected]>\n" "Language: de\n" @@ -17,14 +17,34 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, kde-format +msgid "New Online Account" +msgstr "Neues Online-Konto" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" +"Sie können jetzt Ihre Dateien des Kontos <emphasis strong='true'>%1</" +"emphasis> auf Google Drive verwalten." + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "Öffnen" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "" "Es ist kein Konto für Google Drive aktiviert. Bitte fügen Sie mindestens ein " "Konto hinzu." -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/en_GB/kio5_gdrive.po new/kio-gdrive-1.2.2/po/en_GB/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/en_GB/kio5_gdrive.po 2017-09-30 17:28:31.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/en_GB/kio5_gdrive.po 2018-03-30 11:20:56.000000000 +0200 @@ -6,10 +6,10 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" -"PO-Revision-Date: 2017-05-21 17:48+0000\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" +"PO-Revision-Date: 2017-11-26 20:53+0000\n" "Last-Translator: Steve Allewell <[email protected]>\n" -"Language-Team: English <[email protected]>\n" +"Language-Team: British English <[email protected]>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,12 +17,32 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, kde-format +msgid "New Online Account" +msgstr "New Online Account" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "Open" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "There are no Google Drive accounts enabled. Please add at least one." -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/es/kio5_gdrive.po new/kio-gdrive-1.2.2/po/es/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/es/kio5_gdrive.po 2017-09-30 17:28:31.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/es/kio5_gdrive.po 2018-03-30 11:20:56.000000000 +0200 @@ -4,15 +4,15 @@ # # Automatically generated, 2016. # Eloy Cuadra <[email protected]>, 2016. -# Javier Vinal <[email protected]>, 2017. +# Javier Vinal <[email protected]>, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: kio5_gdrive\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" -"PO-Revision-Date: 2017-05-21 23:33+0100\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" +"PO-Revision-Date: 2018-01-05 23:40+0100\n" "Last-Translator: Javier Vinal <[email protected]>\n" -"Language-Team: Spanish <[email protected]>\n" +"Language-Team: Spanish <[email protected]>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,13 +20,33 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, kde-format +msgid "New Online Account" +msgstr "Nueva cuenta en línea" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" +"Usted puede gestionar los archivos de Google Drive de su <emphasis " +"strong='true'>%1</emphasis> cuenta." + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "Abrir" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "" "No hay cuentas de Google Drive Activadas. Por favor, añada al menos una." -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/et/kio5_gdrive.po new/kio-gdrive-1.2.2/po/et/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/et/kio5_gdrive.po 2017-09-30 17:28:32.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/et/kio5_gdrive.po 2018-03-30 11:20:56.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" "PO-Revision-Date: 2016-08-20 03:09+0300\n" "Last-Translator: Marek Laane <[email protected]>\n" "Language-Team: Estonian <[email protected]>\n" @@ -17,12 +17,32 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, fuzzy, kde-format +#| msgctxt "login in a new google account" +#| msgid "New account" +msgid "New Online Account" +msgstr "Uus konto" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "" -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/fr/kio5_gdrive.po new/kio-gdrive-1.2.2/po/fr/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/fr/kio5_gdrive.po 2017-09-30 17:28:33.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/fr/kio5_gdrive.po 2018-03-30 11:20:57.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" "PO-Revision-Date: 2016-11-21 17:31+0100\n" "Last-Translator: Vincent Pinon <[email protected]>\n" "Language-Team: French <[email protected]>\n" @@ -20,12 +20,32 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, fuzzy, kde-format +#| msgctxt "login in a new google account" +#| msgid "New account" +msgid "New Online Account" +msgstr "Nouveau compte" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "Ouvrir" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "" -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/it/kio5_gdrive.po new/kio-gdrive-1.2.2/po/it/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/it/kio5_gdrive.po 2017-09-30 17:28:36.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/it/kio5_gdrive.po 2018-03-30 11:21:00.000000000 +0200 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: kio-gdrive\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" -"PO-Revision-Date: 2017-05-10 23:44+0100\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" +"PO-Revision-Date: 2017-11-25 23:50+0100\n" "Last-Translator: Luigi Toscano <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" "Language: it\n" @@ -17,12 +17,32 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 2.0\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, kde-format +msgid "New Online Account" +msgstr "Nuovo account in linea" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" +"Puoi ora gestire i file su Google Drive del tuo account <emphasis " +"strong='true'>%1</emphasis>." + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "Apri" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "Non ci sono account di Google Drive abilitati. Aggiungine almeno uno." -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/ja/kio5_gdrive.po new/kio-gdrive-1.2.2/po/ja/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/ja/kio5_gdrive.po 2017-09-30 17:28:36.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/ja/kio5_gdrive.po 2018-03-30 11:21:01.000000000 +0200 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: kio5_gdrive\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" "PO-Revision-Date: 2016-08-15 22:30-0700\n" "Last-Translator: Japanese KDE translation team <[email protected]>\n" "Language-Team: Japanese <[email protected]>\n" @@ -14,12 +14,30 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, kde-format +msgid "New Online Account" +msgstr "" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "" -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/ko/kio5_gdrive.po new/kio-gdrive-1.2.2/po/ko/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/ko/kio5_gdrive.po 2017-09-30 17:28:38.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/ko/kio5_gdrive.po 2018-03-30 11:21:02.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" "PO-Revision-Date: 2017-01-22 21:17+0100\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" @@ -17,12 +17,32 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 2.0\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, fuzzy, kde-format +#| msgctxt "login in a new google account" +#| msgid "New account" +msgid "New Online Account" +msgstr "새 계정" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "" -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/nl/kio5_gdrive.po new/kio-gdrive-1.2.2/po/nl/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/nl/kio5_gdrive.po 2017-09-30 17:28:41.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/nl/kio5_gdrive.po 2018-03-30 11:21:04.000000000 +0200 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" -"PO-Revision-Date: 2017-05-09 10:17+0100\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" +"PO-Revision-Date: 2017-11-23 14:39+0100\n" "Last-Translator: Freek de Kruijf <[email protected]>\n" "Language-Team: Dutch <[email protected]>\n" "Language: nl\n" @@ -17,13 +17,33 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, kde-format +msgid "New Online Account" +msgstr "Nieuw online account" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" +"U kunt nu de bestanden op Google Drive vanuit uw <emphasis strong='true'>%1</" +"emphasis> account beheren." + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "Openen" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "" "Er zijn geen Google Drive accounts ingeschakeld. Voeg er minstens één toe." -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/pl/kio5_gdrive.po new/kio-gdrive-1.2.2/po/pl/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/pl/kio5_gdrive.po 2017-09-30 17:28:42.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/pl/kio5_gdrive.po 2018-03-30 11:21:05.000000000 +0200 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" -"PO-Revision-Date: 2017-05-13 07:33+0100\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" +"PO-Revision-Date: 2017-12-02 07:24+0100\n" "Last-Translator: Łukasz Wojniłowicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" "Language: pl\n" @@ -18,12 +18,32 @@ "|| n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, kde-format +msgid "New Online Account" +msgstr "Nowe konto sieciowe" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" +"Od teraz możesz zarządzać plikami na Dysku Gogle swojego konta <emphasis " +"strong='true'>%1</emphasis>." + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "Otwórz" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "Nie włączono żadnego konta Dysku Google. Dodaj conajmniej jedno." -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/pt/kio5_gdrive.po new/kio-gdrive-1.2.2/po/pt/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/pt/kio5_gdrive.po 2017-09-30 17:28:42.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/pt/kio5_gdrive.po 2018-03-30 11:21:05.000000000 +0200 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: kio5_gdrive\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" -"PO-Revision-Date: 2017-05-09 12:19+0100\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" +"PO-Revision-Date: 2017-11-23 10:26+0000\n" "Last-Translator: José Nuno Coelho Pires <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" "Language: pt\n" @@ -11,15 +11,34 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-POFile-SpellExtra: Online\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 #, kde-format -msgid "There are no Google Drive accounts enabled. Please add at least one." +msgid "New Online Account" +msgstr "Nova Conta 'Online'" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." msgstr "" -"Não existem conta do Google Drive activas. Por favor, adicione pelo menos " -"uma." +"Poderá agora gerir os ficheiros do Google Drive da sua conta <emphasis " +"strong='true'>%1</emphasis>." + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "Abrir" + +#: src/kio_gdrive.cpp:255 +#, kde-format +msgid "There are no Google Drive accounts enabled. Please add at least one." +msgstr "Não existem contas do Google Drive activas. Adicione pelo menos uma." -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/pt_BR/kio5_gdrive.po new/kio-gdrive-1.2.2/po/pt_BR/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/pt_BR/kio5_gdrive.po 2017-09-30 17:28:43.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/pt_BR/kio5_gdrive.po 2018-03-30 11:21:05.000000000 +0200 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Luiz Fernando Ranghetti <[email protected]>, 2016, 2017. +# Luiz Fernando Ranghetti <[email protected]>, 2016, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" -"PO-Revision-Date: 2017-07-31 10:08-0300\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" +"PO-Revision-Date: 2018-02-21 09:43-0300\n" "Last-Translator: Luiz Fernando Ranghetti <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" "Language: pt_BR\n" @@ -17,12 +17,32 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 2.0\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, kde-format +msgid "New Online Account" +msgstr "Nova conta online" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" +"Você pode agora gerenciar os arquivos do Google Drive de sua conta <emphasis " +"strong='true'>%1</emphasis>." + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "Abrir" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "Não há contas do Google Drive habilitadas. Adicione pelo menos uma." -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/ru/kio5_gdrive.po new/kio-gdrive-1.2.2/po/ru/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/ru/kio5_gdrive.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kio-gdrive-1.2.2/po/ru/kio5_gdrive.po 2018-03-30 11:21:06.000000000 +0200 @@ -0,0 +1,51 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Alexander Potashev <[email protected]>, 2017. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; +"POT-Creation-Date: 2017-11-23 05:00+0100\n" +"PO-Revision-Date: 2017-10-15 14:34+0300\n" +"Last-Translator: Alexander Potashev <[email protected]>\n" +"Language-Team: Russian <[email protected]>\n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"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" +"X-Generator: Lokalize 2.0\n" + +#: kaccounts/kaccountsplugin.cpp:44 +#, fuzzy, kde-format +#| msgctxt "login in a new google account" +#| msgid "New account" +msgid "New Online Account" +msgstr "Добавить учётную запись" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "" + +#: src/kio_gdrive.cpp:255 +#, kde-format +msgid "There are no Google Drive accounts enabled. Please add at least one." +msgstr "" +"Не настроено ни одной учётной записи Диска Google. Добавьте хотя бы одну." + +#: src/kio_gdrive.cpp:278 +#, kde-format +msgctxt "login in a new google account" +msgid "New account" +msgstr "Добавить учётную запись" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/sk/kio5_gdrive.po new/kio-gdrive-1.2.2/po/sk/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/sk/kio5_gdrive.po 2017-09-30 17:28:44.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/sk/kio5_gdrive.po 2018-03-30 11:21:06.000000000 +0200 @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: kio5_gdrive\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" -"PO-Revision-Date: 2017-05-13 10:35+0100\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" +"PO-Revision-Date: 2017-11-24 20:34+0100\n" "Last-Translator: Roman Paholik <[email protected]>\n" "Language-Team: Slovak <[email protected]>\n" "Language: sk\n" @@ -15,12 +15,32 @@ "X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, kde-format +msgid "New Online Account" +msgstr "Nový online účet" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" +"Teraz môžete spravovať súbory Google disku vo vašom <emphasis strong='true'>" +"%1</emphasis> účte." + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "Otvoriť" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "Nie sú povolené žiadne účty Google disk. Prosím, pridajte aspoň jeden." -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/sl/kio5_gdrive.po new/kio-gdrive-1.2.2/po/sl/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/sl/kio5_gdrive.po 2017-09-30 17:28:45.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/sl/kio5_gdrive.po 2018-03-30 11:21:07.000000000 +0200 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Andrej Mernik <[email protected]>, 2016, 2017. +# Andrej Mernik <[email protected]>, 2016, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" -"PO-Revision-Date: 2017-06-04 11:57+0100\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" +"PO-Revision-Date: 2018-01-12 18:23+0100\n" "Last-Translator: Andrej Mernik <[email protected]>\n" "Language-Team: Slovenian <[email protected]>\n" "Language: sl\n" @@ -18,12 +18,32 @@ "%100==4 ? 3 : 0);\n" "X-Generator: Lokalize 2.0\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, kde-format +msgid "New Online Account" +msgstr "Nov spletni račun" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" +"Sedaj lahko upravljate z datotekami v Google Drive za vaš račun <emphasis " +"strong='true'>%1</emphasis>." + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "Odpri" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "Ni omogočenih računov Google Drive. Dodajte vsaj enega." -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/sv/kio5_gdrive.po new/kio-gdrive-1.2.2/po/sv/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/sv/kio5_gdrive.po 2017-09-30 17:28:46.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/sv/kio5_gdrive.po 2018-03-30 11:21:08.000000000 +0200 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" -"PO-Revision-Date: 2017-05-09 17:47+0100\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" +"PO-Revision-Date: 2017-11-26 10:53+0100\n" "Last-Translator: Stefan Asserhäll <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" "Language: sv\n" @@ -17,12 +17,32 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, kde-format +msgid "New Online Account" +msgstr "Nytt Internetkonto" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" +"Du kan nu hantera filerna på Google Drive i kontot <emphasis strong='true'>" +"%1</emphasis>." + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "Öppna" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "Det finns inga aktiverade Google Drive-konton. Lägg till minst ett." -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/uk/kio5_gdrive.po new/kio-gdrive-1.2.2/po/uk/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/uk/kio5_gdrive.po 2017-09-30 17:28:47.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/uk/kio5_gdrive.po 2018-03-30 11:21:09.000000000 +0200 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: kio5_gdrive\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" -"PO-Revision-Date: 2017-05-09 10:11+0300\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" +"PO-Revision-Date: 2017-11-23 19:47+0200\n" "Last-Translator: Yuri Chornoivan <[email protected]>\n" "Language-Team: Ukrainian <[email protected]>\n" "Language: uk\n" @@ -18,16 +18,36 @@ "Content-Transfer-Encoding: 8bit\n" "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" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, kde-format +msgid "New Online Account" +msgstr "Новий обліковий запис" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" +"Тепер ви можете керувати файлами Диска Google з вашого облікового запису " +"<emphasis strong='true'>%1</emphasis>." + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "Відкрити" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "" "Не увімкнено жодного облікового запису Google Диск. Будь ласка, додайте " "принаймні один такий обліковий запис." -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/zh_CN/kio5_gdrive.po new/kio-gdrive-1.2.2/po/zh_CN/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/zh_CN/kio5_gdrive.po 2017-09-30 17:28:49.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/zh_CN/kio5_gdrive.po 2018-03-30 11:21:10.000000000 +0200 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" -"PO-Revision-Date: 2017-09-22 18:23-0400\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" +"PO-Revision-Date: 2018-03-29 06:45-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -20,12 +20,32 @@ "X-Crowdin-Language: zh-CN\n" "X-Crowdin-File: /kf5-stable/messages/extragear-network/kio5_gdrive.pot\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 #, kde-format -msgid "There are no Google Drive accounts enabled. Please add at least one." +msgid "New Online Account" +msgstr "新建在线账户" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." msgstr "" +"现在您可以管理 <emphasis strong='true'>%1</emphasis> 帐号的 Google 云端硬盘文" +"件了。" + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "打开" + +#: src/kio_gdrive.cpp:255 +#, kde-format +msgid "There are no Google Drive accounts enabled. Please add at least one." +msgstr "没有启用的 Google 云端硬盘账户。请至少添加一个。" -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/po/zh_TW/kio5_gdrive.po new/kio-gdrive-1.2.2/po/zh_TW/kio5_gdrive.po --- old/kio-gdrive-1.2.1/po/zh_TW/kio5_gdrive.po 2017-09-30 17:28:49.000000000 +0200 +++ new/kio-gdrive-1.2.2/po/zh_TW/kio5_gdrive.po 2018-03-30 11:21:11.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kio5_gdrive\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-28 05:30+0200\n" +"POT-Creation-Date: 2017-11-23 05:00+0100\n" "PO-Revision-Date: 2016-11-24 08:13+0800\n" "Last-Translator: Jeff Huang <[email protected]>\n" "Language-Team: Chinese <[email protected]>\n" @@ -17,12 +17,32 @@ "X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: kio_gdrive.cpp:255 +#: kaccounts/kaccountsplugin.cpp:44 +#, fuzzy, kde-format +#| msgctxt "login in a new google account" +#| msgid "New account" +msgid "New Online Account" +msgstr "新增帳戶" + +#: kaccounts/kaccountsplugin.cpp:45 +#, kde-kuit-format +msgctxt "@info" +msgid "" +"You can now manage the Google Drive files of your <emphasis strong='true'>" +"%1</emphasis> account." +msgstr "" + +#: kaccounts/kaccountsplugin.cpp:46 +#, kde-format +msgid "Open" +msgstr "" + +#: src/kio_gdrive.cpp:255 #, kde-format msgid "There are no Google Drive accounts enabled. Please add at least one." msgstr "" -#: kio_gdrive.cpp:278 +#: src/kio_gdrive.cpp:278 #, kde-format msgctxt "login in a new google account" msgid "New account" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/src/Messages.sh new/kio-gdrive-1.2.2/src/Messages.sh --- old/kio-gdrive-1.2.1/src/Messages.sh 2017-09-30 17:28:11.000000000 +0200 +++ new/kio-gdrive-1.2.2/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -#! /usr/bin/env bash - -$XGETTEXT $(find . -name "*.cpp") -o $podir/kio5_gdrive.pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/src/gdrivehelper.cpp new/kio-gdrive-1.2.2/src/gdrivehelper.cpp --- old/kio-gdrive-1.2.1/src/gdrivehelper.cpp 2017-09-30 17:28:11.000000000 +0200 +++ new/kio-gdrive-1.2.2/src/gdrivehelper.cpp 2018-03-30 11:20:26.000000000 +0200 @@ -35,7 +35,12 @@ #define VND_OASIS_OPENDOCUMENT_TEXT QStringLiteral("application/vnd.oasis.opendocument.text") #define VND_OASIS_OPENDOCUMENT_PRESENTATION QStringLiteral("application/vnd.oasis.opendocument.presentation") -#define VND_OASIS_OPENDOCUMENT_SPREADSHEED QStringLiteral("application/x-vnd.oasis.opendocument.spreadsheet") +// Google's Drive API v2 mistakenly documents an x-vnd style MIME type +// for .ods files, so we #define both the correct but undocumented, +// as well as the incorrect but publicly documented MIME type. +#define VND_OASIS_OPENDOCUMENT_SPREADSHEET QStringLiteral("application/vnd.oasis.opendocument.spreadsheet") +#define X_VND_OASIS_OPENDOCUMENT_SPREADSHEET QStringLiteral("application/x-vnd.oasis.opendocument.spreadsheet") + #define VND_OPENXMLFORMATS_OFFICEDOCUMENT_WORDPROCESSINGML_DOCUMENT \ QStringLiteral("application/vnd.openxmlformats-officedocument.wordprocessingml.document") @@ -52,7 +57,7 @@ static const QMap<QString /* mimetype */, QString /* .ext */> ExtensionsMap{ { VND_OASIS_OPENDOCUMENT_TEXT, QStringLiteral(".odt") }, - { VND_OASIS_OPENDOCUMENT_SPREADSHEED, QStringLiteral(".ods") }, + { VND_OASIS_OPENDOCUMENT_SPREADSHEET, QStringLiteral(".ods") }, { VND_OASIS_OPENDOCUMENT_PRESENTATION, QStringLiteral(".odp") }, { VND_OPENXMLFORMATS_OFFICEDOCUMENT_WORDPROCESSINGML_DOCUMENT, QStringLiteral(".docx") }, { VND_OPENXMLFORMATS_OFFICEDOCUMENT_SPREADSHEETML_SHEET, QStringLiteral(".xlsx") }, @@ -79,7 +84,7 @@ APPLICATION_PDF } }, { VND_GOOGLE_APPS_SPREADSHEET, { - VND_OASIS_OPENDOCUMENT_SPREADSHEED, + VND_OASIS_OPENDOCUMENT_SPREADSHEET, VND_OPENXMLFORMATS_OFFICEDOCUMENT_SPREADSHEETML_SHEET, APPLICATION_PDF } } @@ -109,7 +114,13 @@ Q_FOREACH (const QString &targetMimeType, convIt.value()) { const auto linkIt = exportLinks.constFind(targetMimeType); if (linkIt != exportLinks.cend()) { - file->setMimeType(targetMimeType); + // Extra check to safeguard against a mistake in Google's Drive API v2 + // documentation which lists an invalid MIME type for .ods files. + if (targetMimeType == X_VND_OASIS_OPENDOCUMENT_SPREADSHEET) { + file->setMimeType(VND_OASIS_OPENDOCUMENT_SPREADSHEET); + } else { + file->setMimeType(targetMimeType); + } file->setTitle(file->title() + GDriveHelper::ExtensionsMap[targetMimeType]); return *linkIt; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-gdrive-1.2.1/src/kio_gdrive.cpp new/kio-gdrive-1.2.2/src/kio_gdrive.cpp --- old/kio-gdrive-1.2.1/src/kio_gdrive.cpp 2017-09-30 17:28:11.000000000 +0200 +++ new/kio-gdrive-1.2.2/src/kio_gdrive.cpp 2018-03-30 11:20:26.000000000 +0200 @@ -857,14 +857,16 @@ error(KIO::ERR_ACCESS_DENIED, dest.path()); return; } + + QString destDirId; const auto destPathComps = destGDriveUrl.pathComponents(); - if (destGDriveUrl.isAccountRoot()) { - // copy to root + const QString destFileName = destPathComps.last(); + if (destPathComps.size() == 2) { + destDirId = rootFolderId(destAccountId); } else { - const QString destDirId = destPathComps[destPathComps.count() - 2]; - destParentReferences << ParentReferencePtr(new ParentReference(destDirId)); + destDirId = resolveFileIdFromPath(destGDriveUrl.parentPath(), KIOGDrive::PathIsFolder); } - const QString destFileName = destPathComps.last(); + destParentReferences << ParentReferencePtr(new ParentReference(destDirId)); FilePtr destFile(new File); destFile->setTitle(destFileName);
