1. Yuya Nishihara
  2. kdiff3

Commits

joac...@c8aa9fed-2811-0410-8543-893ada326672  committed 78f0f6c

Updates from KDE-repository

  • Participants
  • Parent commits 290f5bf
  • Branches default

Comments (0)

Files changed (9)

File kdiff3fileitemactionplugin/kdiff3fileitemaction.cpp

View file
 
 
 K_PLUGIN_FACTORY(KDiff3FileItemActionFactory, registerPlugin<KDiff3FileItemAction>();)
-K_EXPORT_PLUGIN(KDiff3FileItemActionFactory("KDiff3FileItemAction"))
+K_EXPORT_PLUGIN(KDiff3FileItemActionFactory("kdiff3fileitemactionplugin"))
 
 KDiff3FileItemAction::KDiff3FileItemAction (QObject* pParent, const QVariantList & /*args*/)
 : KFileItemActionPlugin(pParent)
              "For a 3-way merge first \"Save\" the base file, then the branch to merge and "
              "choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
              "Same also applies to directory comparison and merge.");
-   KMessageBox::information(m_pParentWidget, s, tr("About KDiff3 File Item Action Plugin") );
+   KMessageBox::information(m_pParentWidget, s, i18n("About KDiff3 File Item Action Plugin") );
 }
 

File kdiff3fileitemactionplugin/kdiff3fileitemaction.desktop

View file
 Type=Service
 Name=Compare/Merge Files/Directories with KDiff3
 Name[bg]=Сравняване/Сливане на файлове/директории с KDiff3
+Name[bs]=Poredi/Spoji datoteke/Direktorije sa KDiff3
+Name[ca]=Compara/fusiona fitxers/directoris amb KDiff3
+Name[ca@valencia]=Compara/fusiona fitxers/directoris amb KDiff3
 Name[cs]=Porovnat/spojit soubory/adresáře pomocí KDiff3
+Name[da]=Sammenlign/sammenflet filer/mapper med KDiff3
 Name[de]=Dateien und Ordner vergleichen und zusammenführen mit KDiff3
 Name[el]=Σύγκριση/Συγχώνευση αρχείων/καταλόγων με το KDiff3
+Name[en_GB]=Compare/Merge Files/Directories with KDiff3
 Name[es]=Comparar/fusionar archivos/directorios con KDiff3
 Name[et]=Failide/kataloogide võrdlemine/liitmine KDiff3-ga
-Name[fr]=Comparer / Fusionner les fichiers / dossiers à l'aide de KDiff3
-Name[ga]=Comhaid/Comhadlanna a Chur i gComparáid/a Chumasc le KDiff3
+Name[fr]=Comparaison / Fusion de fichiers / de dossiers à l'aide de KDiff3
+Name[ga]=Cuir Comhaid/Comhadlanna i gComparáid agus Cumaisc iad le KDiff3
 Name[gl]=Compara e fusionar ficheiros e cartafoles con KDiff3
 Name[hi]=केडिफ़३ के साथ तुलना करें/मिलाएं फ़ाइलें/डिरेक्ट्रीज़
+Name[hne]=केडिफ३ के साथ तुलना करव/मिलाव फाइल/डिरेक्टरीज मन ल
+Name[hu]=Fájlok/Könyvtárat KDiff3-mal való összehasonlítása/egyesítése
+Name[it]=Confronta o fondi file e cartelle con KDiff3
 Name[ja]=KDiff3 でファイルやディレクトリを比較/マージ
 Name[km]=ប្រៀបធៀប/បញ្ចូល​ឯកសារ​ចូល​គ្នា/ថត​ជាមួយ KDiff3
 Name[ko]=KDiff3으로 파일과 디렉터리를 비교하거나 병합합니다
+Name[ml]=ഫയലുകള്‍/അറകള്‍ താരതമ്യം ചെയ്യുക/കെഡിഫ്3 ഉപയോഗിച്ചു് ലയിപ്പിക്കുക
+Name[nb]=Samenlikne/flette filer/mapper med KDiff3
 Name[nds]=Verglieken Tosamenföhren vun Dateien/Ornern mit KDiff3
 Name[nl]=Bestanden/mappen vergelijken/samenvoegen met KDiff3
 Name[nn]=Samanlikn/flett filer og mapper med KDiff3
+Name[pl]=Porównaj/Scal pliki/katalogi przy pomocy KDiff3
 Name[pt]=Comparar/Juntar os Ficheiros/Pastas com o KDiff3
-Name[pt_BR]=Compara/Mescla Arquivos/Diretórios com KDiff3
+Name[pt_BR]=Comparar/Mesclar arquivos/pastas com o KDiff3
 Name[ro]=Compară/unește fișiere/directoare cu KDiff3
+Name[ru]=Сравнение и объединение файлов и каталогов в KDiff3
 Name[sv]=Jämför, sammanfoga filer, kataloger med Kdiff3
 Name[tr]=KDiff3 ile Dosyaları/Klasörleri Karşılaştır/Birleştir
 Name[uk]=Порівнюйте або з’єднуйте файли або теки з KDiff3
 Name[zh_TW]=用 KDiff3 比較/合併檔案與目錄
 X-KDE-Library=kdiff3fileitemaction
 X-KDE-Submenu=KDiff3
+X-KDE-Submenu[bg]=KDiff3
+X-KDE-Submenu[bs]=KDiff3
+X-KDE-Submenu[ca]=KDiff3
+X-KDE-Submenu[cs]=KDiff3
+X-KDE-Submenu[da]=KDiff3
+X-KDE-Submenu[de]=KDiff3
+X-KDE-Submenu[el]=KDiff3
+X-KDE-Submenu[es]=KDiff3
+X-KDE-Submenu[et]=KDiff3
+X-KDE-Submenu[fr]=KDiff3
+X-KDE-Submenu[hu]=KDiff3
+X-KDE-Submenu[it]=KDiff3
+X-KDE-Submenu[nb]=KDiff3
+X-KDE-Submenu[nds]=KDiff3
+X-KDE-Submenu[nl]=KDiff3
+X-KDE-Submenu[pl]=KDiff3
+X-KDE-Submenu[pt]=KDiff3
+X-KDE-Submenu[pt_BR]=KDiff3
+X-KDE-Submenu[ru]=KDiff3
+X-KDE-Submenu[sv]=Kdiff3
+X-KDE-Submenu[uk]=KDiff3
+X-KDE-Submenu[x-test]=xxKDiff3xx
+X-KDE-Submenu[zh_TW]=KDiff3
 ServiceTypes=KFileItemAction/Plugin
 MimeType=application/octet-stream;

File kdiff3plugin-QT4/kdiff3_plugin.desktop

View file
 Type=Service
 Name=Compare/Merge Files/Directories
 Name[bg]=Сравняване/Сливане на файлове/директории
+Name[bs]=Poredi/Spoji datoteke/Direktorije
+Name[ca]=Compara/fusiona fitxers/directoris
+Name[ca@valencia]=Compara/fusiona fitxers/directoris
 Name[cs]=Porovnat/spojit soubory/adresáře
+Name[da]=Sammenlign/sammenflet filer/mapper
 Name[de]=Dateien und Ordner vergleichen und zusammenführen
 Name[el]=Σύγκριση/Συγχώνευση αρχείων/καταλόγων
+Name[en_GB]=Compare/Merge Files/Directories
 Name[es]=Comparar/fusionar archivos/directorios
 Name[et]=Failide/kataloogide võrdlemine/liitmine
-Name[fr]=Comparer / Fusionner les fichiers / dossiers
-Name[ga]=Comhaid/Comhadlanna a Chur i gComparáid/a Chumasc
+Name[fr]=Comparaison / Fusion de fichiers / de dossiers
+Name[ga]=Cuir Comhaid/Comhadlanna i gComparáid agus Cumaisc iad
 Name[gl]=Comparar e fusionar ficheiros e cartafoles
 Name[hi]=तुलना करें/मिलाएं फ़ाइलें/डिरेक्ट्रीज़
+Name[hne]=फाइल/डिरेक्टरीज मन ल तुलना करव / मिलाव
+Name[hu]=Fájlok/Könyvtárak összehasonlítása/egyesítése
+Name[it]=Confronta o fondi file e cartelle
 Name[ja]=ファイルやディレクトリを比較/マージ
 Name[km]=ប្រៀបធៀប/បញ្ចូល​ឯកសារ​ចូល​គ្នា/ថត
 Name[ko]=파일과 디렉터리를 비교하거나 병합
+Name[ml]=ഫയലുകള്‍/അറകള്‍ താരതമ്യം ചെയ്യുക/ലയിപ്പിക്കുക
+Name[nb]=Samenlikne/flette filer/mapper
 Name[nds]=Verglieken/Tosamenföhren Dateien Ornern
 Name[nl]=Bestanden/mappen vergelijken/samenvoegen
 Name[nn]=Samanlikn/flett filer og mapper
+Name[pl]=Porównanie/Łączenie plików i katalogów
 Name[pt]=Comparar/Juntar os Ficheiros/Pastas
-Name[pt_BR]=Compara/Mescla Arquivos/Diretórios
+Name[pt_BR]=Comparar/Mesclar arquivos/pastas
 Name[ro]=Compară/unește fișiere/directoare
+Name[ru]=Сравнение и объединение файлов и каталогов
 Name[sv]=Jämför, sammanfoga filer, kataloger
 Name[tr]=Dosyaları/Klasörleri Karşılaştır/Birleştir
 Name[uk]=Порівняння/З’єднання Файлів/Тек

File kdiff3plugin-QT4/kdiff3plugin.cpp

View file
 KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupMenu, const QStringList & /* list */ )
 :KonqPopupMenuPlugin(pPopupMenu)
 {
-   KGlobal::locale()->insertCatalog("kdiff3_plugin");
+   KGlobal::locale()->insertCatalog("kdiff3plugin");
    m_pPopupMenu = pPopupMenu;
    m_pParentWidget = pPopupMenu->parentWidget();
 }
 {
    QString s = i18n("KDiff3 Menu Plugin: Copyright (C) 2008 Joachim Eibl\n"
                     "KDiff3 homepage: http://kdiff3.sourceforge.net\n\n");
-   s += i18n("Using the contextmenu extension:\n"
+   s += i18n("Using the context menu extension:\n"
              "For simple comparison of two selected files choose \"Compare\".\n"
-             "If the other file is somewhere else \"Save\" the first file for later. "
-             "It will appear in the \"Compare With ...\" submenu. "
-             "Then use \"Compare With\" on second file.\n"
-             "For a 3-way merge first \"Save\" the base file, then the branch to merge and "
-             "choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
-             "Same also applies to directory comparison and merge.");
-   KMessageBox::information(m_pParentWidget, s, tr("About KDiff3 Menu Plugin") );
+             "If the other file is somewhere else, \"Save\" the first file for later, "
+             "and it will appear in the \"Compare With ...\" submenu. "
+             "Then, use \"Compare With\" on the second file.\n"
+             "For a 3-way merge first, \"Save\" the base file, then the branch to merge, and "
+             "then \"3-way merge with base\" on the other branch which will be used as the destination.\n"
+             "The same also applies to directory comparison and merge.");
+   KMessageBox::information(m_pParentWidget, s, i18n("About KDiff3 Menu Plugin") );
 }
 

File kdiff3plugin-QT4/kdiff3plugin.desktop

View file
 Type=Service
 Name=Compare/Merge Files/Directories with KDiff3
 Name[bg]=Сравняване/Сливане на файлове/директории с KDiff3
+Name[bs]=Poredi/Spoji datoteke/Direktorije sa KDiff3
+Name[ca]=Compara/fusiona fitxers/directoris amb KDiff3
+Name[ca@valencia]=Compara/fusiona fitxers/directoris amb KDiff3
 Name[cs]=Porovnat/spojit soubory/adresáře pomocí KDiff3
+Name[da]=Sammenlign/sammenflet filer/mapper med KDiff3
 Name[de]=Dateien und Ordner vergleichen und zusammenführen mit KDiff3
 Name[el]=Σύγκριση/Συγχώνευση αρχείων/καταλόγων με το KDiff3
+Name[en_GB]=Compare/Merge Files/Directories with KDiff3
 Name[es]=Comparar/fusionar archivos/directorios con KDiff3
 Name[et]=Failide/kataloogide võrdlemine/liitmine KDiff3-ga
-Name[fr]=Comparer / Fusionner les fichiers / dossiers à l'aide de KDiff3
-Name[ga]=Comhaid/Comhadlanna a Chur i gComparáid/a Chumasc le KDiff3
+Name[fr]=Comparaison / Fusion de fichiers / de dossiers à l'aide de KDiff3
+Name[ga]=Cuir Comhaid/Comhadlanna i gComparáid agus Cumaisc iad le KDiff3
 Name[gl]=Compara e fusionar ficheiros e cartafoles con KDiff3
 Name[hi]=केडिफ़३ के साथ तुलना करें/मिलाएं फ़ाइलें/डिरेक्ट्रीज़
+Name[hne]=केडिफ३ के साथ तुलना करव/मिलाव फाइल/डिरेक्टरीज मन ल
+Name[hu]=Fájlok/Könyvtárat KDiff3-mal való összehasonlítása/egyesítése
+Name[it]=Confronta o fondi file e cartelle con KDiff3
 Name[ja]=KDiff3 でファイルやディレクトリを比較/マージ
 Name[km]=ប្រៀបធៀប/បញ្ចូល​ឯកសារ​ចូល​គ្នា/ថត​ជាមួយ KDiff3
 Name[ko]=KDiff3으로 파일과 디렉터리를 비교하거나 병합합니다
+Name[ml]=ഫയലുകള്‍/അറകള്‍ താരതമ്യം ചെയ്യുക/കെഡിഫ്3 ഉപയോഗിച്ചു് ലയിപ്പിക്കുക
+Name[nb]=Samenlikne/flette filer/mapper med KDiff3
 Name[nds]=Verglieken Tosamenföhren vun Dateien/Ornern mit KDiff3
 Name[nl]=Bestanden/mappen vergelijken/samenvoegen met KDiff3
 Name[nn]=Samanlikn/flett filer og mapper med KDiff3
+Name[pl]=Porównaj/Scal pliki/katalogi przy pomocy KDiff3
 Name[pt]=Comparar/Juntar os Ficheiros/Pastas com o KDiff3
-Name[pt_BR]=Compara/Mescla Arquivos/Diretórios com KDiff3
+Name[pt_BR]=Comparar/Mesclar arquivos/pastas com o KDiff3
 Name[ro]=Compară/unește fișiere/directoare cu KDiff3
+Name[ru]=Сравнение и объединение файлов и каталогов в KDiff3
 Name[sv]=Jämför, sammanfoga filer, kataloger med Kdiff3
 Name[tr]=KDiff3 ile Dosyaları/Klasörleri Karşılaştır/Birleştir
 Name[uk]=Порівнюйте або з’єднуйте файли або теки з KDiff3

File src-QT4/kdiff3.desktop

View file
 Name=KDiff3
 Name[be]=KDiff3
 Name[bg]=KDiff3
+Name[bs]=KDiff3
 Name[ca]=KDiff3
 Name[ca@valencia]=KDiff3
 Name[cs]=KDiff3
 Name[pt]=KDiff3
 Name[pt_BR]=KDiff3
 Name[ro]=KDiff3
+Name[ru]=KDiff3
 Name[sv]=Kdiff3
 Name[tr]=KDiff3
 Name[uk]=KDiff3
 Name[zh_TW]=KDiff3
 GenericName=Diff/Patch Frontend
 GenericName[bg]=Интерфейс на Diff/Patch
+GenericName[bs]=Prikaz za Diff/Patch
 GenericName[ca]=Frontal de Diff/Patch
 GenericName[ca@valencia]=Frontal de Diff/Patch
 GenericName[cs]=Rozhraní pro Diff/Patch
 GenericName[eo]=Fasado por la programoj "diff" kaj "patch"
 GenericName[es]=Interfaz para diff/patch
 GenericName[et]=Võrdlemise ja liitmise rakendus
-GenericName[fr]=Interface utilisateur pour Diff / Patch
+GenericName[fr]=Interface pour Diff / Patch
 GenericName[ga]=Comhéadan Diff/Patch
 GenericName[gl]=Interface para Diff e Patch
 GenericName[hi]=डिफ/पैच फ्रन्टएण्ड
 GenericName[pt]=Interface do Diff/Patch
 GenericName[pt_BR]=Interface do diff/patch
 GenericName[ro]=Interfață Diferențiere/Cîrpire
+GenericName[ru]=Графический интерфейс Diff/Patch
 GenericName[sv]=Jämförelse- och programfixgränssnitt
 GenericName[tr]=Diff/Patch Arayüzü
 GenericName[uk]=Графічна оболонка Diff/Patch
 X-DocPath=kdiff3/index.html
 Comment=A File And Directory Comparison And Merge Tool
 Comment[bg]=Инструмент за сравняване и сливане на файлове и директории
+Comment[bs]=Alat za poređenje i spajanje direktorija i datoteka
 Comment[ca]=Una eina de comparació i fusió de fitxer i directori
 Comment[ca@valencia]=Una eina de comparació i fusió de fitxer i directori
 Comment[cs]=Nástroj pro porovnávání a slučování souborů a adresářů
 Comment[pt]=Uma Ferramenta de Comparação e Junção de Ficheiros e Pastas
 Comment[pt_BR]=Uma ferramenta de comparação e junção de arquivos e pastas
 Comment[ro]=Un instrument de comparare și unire a fișierelor și directoarelor
+Comment[ru]=Инструмент для сравнения и объединения файлов и каталогов
 Comment[sv]=Ett jämförelseverktyg för fil- och katalogjämförelser
 Comment[tr]=Bir Dosya Ve Klasör Karşılaştırma Ve Birleştirme Aracı
 Comment[uk]=Інструмент для порівняння та з’єднання файлів та тек

File src-QT4/kdiff3part.desktop

View file
 [Desktop Entry]
 Name=KDiff3Part
 Name[bg]=KDiff3Part
+Name[bs]=KDiff3Part
 Name[ca]=KDiff3Part
 Name[ca@valencia]=KDiff3Part
 Name[cs]=KDiff3Part
 Name[nds]=KDiff3Part
 Name[nl]=KDiff3Part
 Name[nn]=KDiff3Part
-Name[pl]=KDiff3Part
+Name[pl]=Moduł KDiff3
 Name[pt]=KDiff3Part
 Name[pt_BR]=KDiff3Part
 Name[ro]=KDiff3Part
+Name[ru]=KDiff3Part
 Name[sv]=Kdiff3-del
 Name[tr]=KDiff3Part
 Name[uk]=KDiff3Part

File src-QT4/stable.cpp

View file
-#include "stable.h"
+#include "stable.h"

File src-QT4/stable.h

View file
-#ifndef STABLE_H
-#define STABLE_H
-#include <QtCore>
-#include <QtGui>
-#ifdef _WIN32
-#include <qt_windows.h>
-#endif
-#endif
+#ifndef STABLE_H
+#define STABLE_H
+#include <QtCore>
+#include <QtGui>
+#ifdef _WIN32
+#include <qt_windows.h>
+#endif
+#endif