summaryrefslogtreecommitdiffstats
path: root/kompare
diff options
context:
space:
mode:
Diffstat (limited to 'kompare')
-rw-r--r--kompare/CMakeL10n.txt6
-rw-r--r--kompare/CMakeLists.txt14
-rw-r--r--kompare/kompare.desktop65
-rw-r--r--kompare/komparenavtreepart/CMakeLists.txt7
-rw-r--r--kompare/komparenavtreepart/komparenavtreepart.desktop5
-rw-r--r--kompare/komparepart/CMakeLists.txt7
-rw-r--r--kompare/komparepart/komparepart.desktop19
-rw-r--r--kompare/libdiff2/diffmodel.cpp2
-rw-r--r--kompare/libdiff2/komparemodellist.cpp2
-rw-r--r--kompare/main.cpp3
-rw-r--r--kompare/tests/cvsdiff/contextm.diff3
-rw-r--r--kompare/tests/cvsdiff/edm.diff3
-rw-r--r--kompare/tests/cvsdiff/normalm.diff4
-rw-r--r--kompare/tests/cvsdiff/rcsm.diff4
-rw-r--r--kompare/tests/cvsdiff/unifiedm.diff5
-rw-r--r--kompare/tests/diff/contextm.diff5
-rw-r--r--kompare/tests/diff/edm.diff4
-rw-r--r--kompare/tests/diff/normalm.diff4
-rw-r--r--kompare/tests/diff/rcsm.diff4
-rw-r--r--kompare/tests/diff/unifiedm.diff5
20 files changed, 36 insertions, 135 deletions
diff --git a/kompare/CMakeL10n.txt b/kompare/CMakeL10n.txt
index 79671986..2018894d 100644
--- a/kompare/CMakeL10n.txt
+++ b/kompare/CMakeL10n.txt
@@ -1,3 +1,9 @@
##### create translation templates ##############
tde_l10n_create_template( "kompare" )
+
+tde_l10n_create_template(
+ CATALOG "desktop_files/kompare-desktops/"
+ SOURCES *.desktop
+ DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
diff --git a/kompare/CMakeLists.txt b/kompare/CMakeLists.txt
index 4977eb71..2556897a 100644
--- a/kompare/CMakeLists.txt
+++ b/kompare/CMakeLists.txt
@@ -35,12 +35,18 @@ link_directories(
##### other data ################################
-install( FILES kompare.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+tde_create_translated_desktop(
+ SOURCE kompare.desktop
+ PO_DIR kompare-desktops
+)
+
install( FILES kompareui.rc DESTINATION ${DATA_INSTALL_DIR}/kompare )
-install( FILES
- komparenavigationpart.desktop kompareviewpart.desktop
- DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+tde_create_translated_desktop(
+ SOURCE komparenavigationpart.desktop kompareviewpart.desktop
+ DESTINATION ${SERVICETYPES_INSTALL_DIR}
+ PO_DIR kompare-desktops
+)
##### kompare (executable) ######################
diff --git a/kompare/kompare.desktop b/kompare/kompare.desktop
index a057f7c7..4529b415 100644
--- a/kompare/kompare.desktop
+++ b/kompare/kompare.desktop
@@ -1,68 +1,9 @@
[Desktop Entry]
-Type=Application
Name=Kompare
-Name[af]=K-vergelyk
-Name[eo]=Komparilo
-Name[hi]=काम्पेयर
-Name[lv]=Salīdzināt
-Name[ne]=तुलना
-Name[pa]=ਕੇ-ਤੁਲਨਾ
-Name[ta]=கோம்பெர்
-Name[th]=เปรียบเทียบ
-Name[tr]=Karşılaştır
+
GenericName=Diff/Patch Frontend
-GenericName[af]=Diff/Lap Voorprogram
-GenericName[bs]=Frontend za Diff/Patch
-GenericName[ca]=Interfície per a diff/patch
-GenericName[cs]=Rozhraní pro Diff/Patch
-GenericName[cy]=Blaen Gwahaniaethau/Clytiau
-GenericName[da]=Diff/patch-grænseflade
-GenericName[de]=Oberfläche für Diff und Patch
-GenericName[el]=Πρόγραμμα Diff/Patch
-GenericName[eo]=Fasado por la programoj "diff" kaj "patch"
-GenericName[es]=Interfaz Diff/Patch
-GenericName[et]=Diff/patch kasutajaliides
-GenericName[eu]=Desberdintasun/Adabaki interfazea
-GenericName[fa]=پایانۀ Diff/کژنه
-GenericName[fi]=Diff/Patch-käyttöliittymä
-GenericName[fr]=Interface graphique pour Diff et Patch
-GenericName[ga]=Comhéadan Diff/Patch
-GenericName[gl]=Interface para Diff/Patch
-GenericName[he]=ממשק ל-Diff/Patch
-GenericName[hi]=डिफ/पैच फ्रन्टएण्ड
-GenericName[hr]=Sučelje za Diff/Patch
-GenericName[hu]=Grafikus diff/patch
-GenericName[is]=Myndrænt viðmót á Diff/Patch
-GenericName[it]=Interfaccia per diff e patch
-GenericName[ja]=Diff/Patch フロントエンド
-GenericName[kk]=Diff/Patch интерфейсі
-GenericName[lt]=Diff/Patch naudotojo sąsaja
-GenericName[lv]=Diff/Patch Frontends
-GenericName[ms]=Bahagian Depan Beza/Tampal
-GenericName[nb]=Diff-/Patch-grensesnitt
-GenericName[nds]=Böversiet för "diff" un "patch"
-GenericName[ne]=Diff/Patch फ्रन्टइन्ड
-GenericName[nl]=Diff/Patch-hulpprogramma
-GenericName[nn]=Diff-/Patch-grensesnitt
-GenericName[pa]=Diff/Patch ਮੁੱਖ
-GenericName[pl]=Interfejs dla programów diff i patch
-GenericName[pt]=Interface do Diff/Patch
-GenericName[pt_BR]=Interface para Diferenças (diff)/Correções
-GenericName[ro]=Interfaţă grafică pentru "diff" şi "patch"
-GenericName[ru]=Сравнение файлов
-GenericName[sk]=Rozhranie Diff/Patch
-GenericName[sl]=Vmesnik za diff/patch
-GenericName[sr]=Интерфејс за Diff/Patch
-GenericName[sr@Latn]=Interfejs za Diff/Patch
-GenericName[sv]=Gränssnitt för Diff/Patch
-GenericName[ta]=டிப்/ஒட்டு முன்பகுதி
-GenericName[tg]=Утилитаи баробаркунии файлҳо
-GenericName[th]=ฟรอนต์เอนด์ของ Diff/Patch
-GenericName[tr]=Diff/Yama Önyüzü
-GenericName[uk]=Інтерфейс до diff/patch
-GenericName[zh_CN]=Diff/Patch 前端
-GenericName[zh_TW]=Diff/Patch 前端
-GenericName[zu]=Diff/PatchIsiqalo sokugcina
+
+Type=Application
MimeType=text/x-diff;
Exec=kompare -caption "%c" %i %m -o %U
Icon=kompare
diff --git a/kompare/komparenavtreepart/CMakeLists.txt b/kompare/komparenavtreepart/CMakeLists.txt
index 732d27d5..44f32ece 100644
--- a/kompare/komparenavtreepart/CMakeLists.txt
+++ b/kompare/komparenavtreepart/CMakeLists.txt
@@ -23,8 +23,11 @@ link_directories(
##### other data ################################
-install( FILES komparenavtreepart.desktop
- DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+ SOURCE komparenavtreepart.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+ PO_DIR kompare-desktops
+)
##### libkomparenavtreepart (module) ############
diff --git a/kompare/komparenavtreepart/komparenavtreepart.desktop b/kompare/komparenavtreepart/komparenavtreepart.desktop
index 5f0b6bc1..5ac03783 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.desktop
+++ b/kompare/komparenavtreepart/komparenavtreepart.desktop
@@ -1,9 +1,6 @@
[Desktop Entry]
Name=KompareNavTreePart
-Name[pl]=Komponent drzewa nawigacyjnego Kompare
-Name[pt_BR]=Componente da árvore do Kompare
-Name[sv]=Kompare-navigeringsträdsdel
-Name[ta]=கோம்பெர் மரம் பாகம்
+
MimeType=text/x-diff
X-TDE-ServiceTypes=Kompare/NavigationPart
X-TDE-Library=libkomparenavtreepart
diff --git a/kompare/komparepart/CMakeLists.txt b/kompare/komparepart/CMakeLists.txt
index 10083566..06682808 100644
--- a/kompare/komparepart/CMakeLists.txt
+++ b/kompare/komparepart/CMakeLists.txt
@@ -25,8 +25,11 @@ link_directories(
##### other data ################################
-install( FILES komparepart.desktop
- DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+ SOURCE komparepart.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+ PO_DIR kompare-desktops
+)
install( FILES komparepartui.rc
DESTINATION ${DATA_INSTALL_DIR}/kompare )
diff --git a/kompare/komparepart/komparepart.desktop b/kompare/komparepart/komparepart.desktop
index 0c4daf4d..b164135e 100644
--- a/kompare/komparepart/komparepart.desktop
+++ b/kompare/komparepart/komparepart.desktop
@@ -1,21 +1,8 @@
[Desktop Entry]
-GenericComment=A part to graphically show the difference between 2 files
Name=KomparePart
-Name[af]=K-vergelyk-deel
-Name[de]=Einbettungsfähige Komponente von Kompare
-Name[eo]=Komparo-parto
-Name[he]=רכיב Kompare
-Name[hi]=काम्पेयर-पार्ट
-Name[lv]=SalīdzinātDaļu
-Name[pl]=Moduł Kompare
-Name[pt_BR]=Parte do Kompare
-Name[ro]=Componentă Kompare
-Name[ru]=Компонент утилиты сравнения файлов
-Name[sv]=Kompare-del
-Name[ta]=கோம்பெர் உறுப்பு
-Name[tg]=Қисмати утилитҳои баробаркунии файлҳо
-Name[th]=ส่วนเปรียบเทียบ
-Name[zu]=Ingxenye yeKompare
+
+Comment=A part to graphically show the difference between 2 files
+
MimeType=text/x-diff
X-TDE-ServiceTypes=Kompare/ViewPart,KParts/ReadWritePart,KParts/ReadOnlyPart
X-TDE-Library=libkomparepart
diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp
index 82c3625d..97aaedcc 100644
--- a/kompare/libdiff2/diffmodel.cpp
+++ b/kompare/libdiff2/diffmodel.cpp
@@ -405,5 +405,3 @@ bool DiffModel::setSelectedDifference( Difference* diff )
}
#include "diffmodel.moc"
-
-/* vim: set ts=4 sw=4 noet: */
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp
index 0011da62..11171ade 100644
--- a/kompare/libdiff2/komparemodellist.cpp
+++ b/kompare/libdiff2/komparemodellist.cpp
@@ -1419,5 +1419,3 @@ void KompareModelList::slotActionUnapplyAllDifferences()
}
#include "komparemodellist.moc"
-
-/* vim: set ts=4 sw=4 noet: */
diff --git a/kompare/main.cpp b/kompare/main.cpp
index 811bde3d..8f8a378a 100644
--- a/kompare/main.cpp
+++ b/kompare/main.cpp
@@ -212,6 +212,3 @@ int main(int argc, char *argv[])
return kapp->exec();
}
-
-/* vim: set ts=4 sw=4 noet: */
-
diff --git a/kompare/tests/cvsdiff/contextm.diff b/kompare/tests/cvsdiff/contextm.diff
index b7d82cff..ad3a9132 100644
--- a/kompare/tests/cvsdiff/contextm.diff
+++ b/kompare/tests/cvsdiff/contextm.diff
@@ -730,9 +730,6 @@ diff -c -r1.26 dcop.cpp
+
return 0;
}
-+
-+ // vim: set ts=8 sts=4 sw=4 noet:
-+
Index: client/dcopfind.cpp
===================================================================
RCS file: /home/kde/tdelibs/dcop/client/dcopfind.cpp,v
diff --git a/kompare/tests/cvsdiff/edm.diff b/kompare/tests/cvsdiff/edm.diff
index 5e1f338d..a88ddde7 100644
--- a/kompare/tests/cvsdiff/edm.diff
+++ b/kompare/tests/cvsdiff/edm.diff
@@ -4,9 +4,6 @@ RCS file: /home/kde/tdelibs/dcop/client/dcop.cpp,v
retrieving revision 1.26
diff -e -r1.26 dcop.cpp
343a
-
-// vim: set ts=8 sts=4 sw=4 noet:
-
.
340a
}
diff --git a/kompare/tests/cvsdiff/normalm.diff b/kompare/tests/cvsdiff/normalm.diff
index ead8a517..6a62dbb5 100644
--- a/kompare/tests/cvsdiff/normalm.diff
+++ b/kompare/tests/cvsdiff/normalm.diff
@@ -612,10 +612,6 @@ diff -r1.26 dcop.cpp
> users[ user ] = userList()[ user ];
>
> runDCOP( args, users, session, sessionName, readStdin );
-343a771,773
->
-> // vim: set ts=8 sts=4 sw=4 noet:
->
Index: client/dcopfind.cpp
===================================================================
RCS file: /home/kde/tdelibs/dcop/client/dcopfind.cpp,v
diff --git a/kompare/tests/cvsdiff/rcsm.diff b/kompare/tests/cvsdiff/rcsm.diff
index d3ac561c..3f4884d5 100644
--- a/kompare/tests/cvsdiff/rcsm.diff
+++ b/kompare/tests/cvsdiff/rcsm.diff
@@ -539,10 +539,6 @@ int main( int argc, char** argv )
users[ user ] = userList()[ user ];
runDCOP( args, users, session, sessionName, readStdin );
-a343 3
-
-// vim: set ts=8 sts=4 sw=4 noet:
-
Index: client/dcopfind.cpp
===================================================================
RCS file: /home/kde/tdelibs/dcop/client/dcopfind.cpp,v
diff --git a/kompare/tests/cvsdiff/unifiedm.diff b/kompare/tests/cvsdiff/unifiedm.diff
index a459066e..b7a319f5 100644
--- a/kompare/tests/cvsdiff/unifiedm.diff
+++ b/kompare/tests/cvsdiff/unifiedm.diff
@@ -116,7 +116,7 @@ diff -u -r1.26 dcop.cpp
tqWarning( "arguments do not match" );
exit(1);
}
-@@ -265,79 +294,480 @@
+@@ -265,79 +294,477 @@
}
}
}
@@ -651,9 +651,6 @@ diff -u -r1.26 dcop.cpp
+
return 0;
}
-+
-+// vim: set ts=8 sts=4 sw=4 noet:
-+
Index: client/dcopfind.cpp
===================================================================
RCS file: /home/kde/tdelibs/dcop/client/dcopfind.cpp,v
diff --git a/kompare/tests/diff/contextm.diff b/kompare/tests/diff/contextm.diff
index 570d23fa..5607c94a 100644
--- a/kompare/tests/diff/contextm.diff
+++ b/kompare/tests/diff/contextm.diff
@@ -247,7 +247,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp
return 0;
}
---- 295,773 ----
+--- 295,770 ----
}
}
@@ -724,9 +724,6 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp
return 0;
}
-+
-+ // vim: set ts=8 sts=4 sw=4 noet:
-+
diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
*** dcop/client/dcopfind.cpp Wed Jan 30 22:38:07 2002
--- dcop2/client/dcopfind.cpp Wed Jan 30 22:37:04 2002
diff --git a/kompare/tests/diff/edm.diff b/kompare/tests/diff/edm.diff
index 654e1131..44489e8d 100644
--- a/kompare/tests/diff/edm.diff
+++ b/kompare/tests/diff/edm.diff
@@ -1,8 +1,4 @@
diff -er dcop/client/dcop.cpp dcop2/client/dcop.cpp
-343a
-
-// vim: set ts=8 sts=4 sw=4 noet:
-
.
340a
}
diff --git a/kompare/tests/diff/normalm.diff b/kompare/tests/diff/normalm.diff
index d3c9d893..38676f0e 100644
--- a/kompare/tests/diff/normalm.diff
+++ b/kompare/tests/diff/normalm.diff
@@ -608,10 +608,6 @@ diff -r dcop/client/dcop.cpp dcop2/client/dcop.cpp
> users[ user ] = userList()[ user ];
>
> runDCOP( args, users, session, sessionName, readStdin );
-343a771,773
->
-> // vim: set ts=8 sts=4 sw=4 noet:
->
diff -r dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
39c39
< bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
diff --git a/kompare/tests/diff/rcsm.diff b/kompare/tests/diff/rcsm.diff
index d2a6aa73..588fd7f1 100644
--- a/kompare/tests/diff/rcsm.diff
+++ b/kompare/tests/diff/rcsm.diff
@@ -535,10 +535,6 @@ int main( int argc, char** argv )
users[ user ] = userList()[ user ];
runDCOP( args, users, session, sessionName, readStdin );
-a343 3
-
-// vim: set ts=8 sts=4 sw=4 noet:
-
diff -nr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
d39 1
a39 1
diff --git a/kompare/tests/diff/unifiedm.diff b/kompare/tests/diff/unifiedm.diff
index 85adad04..1b62d739 100644
--- a/kompare/tests/diff/unifiedm.diff
+++ b/kompare/tests/diff/unifiedm.diff
@@ -112,7 +112,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp
tqWarning( "arguments do not match" );
exit(1);
}
-@@ -266,78 +295,479 @@
+@@ -266,78 +295,476 @@
}
}
@@ -646,9 +646,6 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp
return 0;
}
-+
-+// vim: set ts=8 sts=4 sw=4 noet:
-+
diff -aur dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
--- dcop/client/dcopfind.cpp Wed Jan 30 22:38:07 2002
+++ dcop2/client/dcopfind.cpp Wed Jan 30 22:37:04 2002
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 21:21:31 +0000