SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
wilder-5.24
l10n daemon script 4 years ago
parent f717c1d25a
commit 96915c3248
  1. 1
      applets/activitybar/metadata.json
  2. 1
      applets/analog-clock/metadata.json
  3. 1
      applets/appmenu/package/metadata.json
  4. 1
      applets/calendar/package/metadata.json
  5. 1
      applets/digital-clock/package/metadata.json
  6. 1
      applets/icon/package/metadata.json
  7. 1
      applets/manage-inputmethod/metadata.json
  8. 1
      applets/mediacontroller/metadata.json
  9. 1
      applets/notifications/package/metadata.json
  10. 1
      applets/panelspacer/package/metadata.json
  11. 1
      applets/systemmonitor/coreusage/metadata.json
  12. 1
      applets/systemmonitor/cpu/metadata.json
  13. 1
      applets/systemmonitor/diskactivity/metadata.json
  14. 1
      applets/systemmonitor/diskusage/metadata.json
  15. 1
      applets/systemmonitor/memory/metadata.json
  16. 1
      applets/systemmonitor/net/metadata.json
  17. 1
      applets/systemmonitor/systemmonitor/package/metadata.json
  18. 1
      applets/systemtray/container/package/metadata.json
  19. 1
      applets/systemtray/package/metadata.json
  20. 1
      dataengines/geolocation/plasma-dataengine-geolocation.json
  21. 1
      dataengines/hotplug/plasma-dataengine-hotplug.json
  22. 1
      dataengines/keystate/plasma-dataengine-keystate.json
  23. 1
      dataengines/powermanagement/plasma-dataengine-powermanagement.json
  24. 1
      dataengines/soliddevice/plasma-dataengine-soliddevice.json
  25. 1
      dataengines/time/plasma-dataengine-time.json
  26. 1
      kcms/colors/kcm_colors.json
  27. 1
      kioslave/desktop/desktopnotifier.json
  28. 1
      plasmacalendarintegration/holidayeventsplugin.json
  29. 1
      runners/appstream/plasma-runner-appstream.json
  30. 1
      runners/bookmarks/plasma-runner-bookmarks.json
  31. 1
      runners/calculator/plasma-runner-calculator.json
  32. 4
      runners/helprunner/helprunner.json
  33. 1
      runners/locations/plasma-runner-locations.json
  34. 1
      runners/places/plasma-runner-places.json
  35. 1
      runners/recentdocuments/plasma-runner-recentdocuments.json
  36. 1
      runners/services/plasma-runner-services.json
  37. 1
      runners/sessions/plasma-runner-sessions.json
  38. 1
      runners/shell/plasma-runner-shell.json
  39. 1
      runners/webshortcuts/plasma-runner-webshortcuts.json
  40. 1
      runners/windowedwidgets/plasma-runner-windowedwidgets.json
  41. 1
      shell/packageplugins/layouttemplate/plasma-packagestructure-layouttemplate.json
  42. 1
      shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.json
  43. 1
      shell/packageplugins/qmlWallpaper/plasma-packagestructure-wallpaper.json
  44. 1
      shell/packageplugins/shell/plasma-packagestructure-plasma-shell.json
  45. 1
      shell/packageplugins/wallpaperimages/plasma-packagestructure-wallpaperimages.json
  46. 1
      wallpapers/color/metadata.json
  47. 1
      wallpapers/image/imagepackage/metadata.json
  48. 1
      wallpapers/image/slideshowpackage/metadata.json

@ -7,6 +7,7 @@
"Name[ar]": "Bhushan Shah",
"Name[az]": "Bhushan Shah",
"Name[ca]": "Bhushan Shah",
"Name[cs]": "Bhushan Shah",
"Name[en_GB]": "Bhushan Shah",
"Name[es]": "Bhushan Shah",
"Name[fr]": "Bhushan Shah",

@ -7,6 +7,7 @@
"Name[ar]": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[cs]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[fr]": "Marco Martin",

@ -7,6 +7,7 @@
"Name[ar]": "Kai Uwe Broulik",
"Name[az]": "Kai Uwe Broulik",
"Name[ca]": "Kai Uwe Broulik",
"Name[cs]": "Kai Uwe Broulik",
"Name[en_GB]": "Kai Uwe Broulik",
"Name[es]": "Kai Uwe Broulik",
"Name[fr]": "Kai Uwe Broulik",

@ -7,6 +7,7 @@
"Name[ar]": "Sebastian Kügler",
"Name[az]": "Sebastian Kügler",
"Name[ca]": "Sebastian Kügler",
"Name[cs]": "Sebastian Kügler",
"Name[en_GB]": "Sebastian Kügler",
"Name[es]": "Sebastian Kügler",
"Name[fr]": "Sebastian Kügler",

@ -7,6 +7,7 @@
"Name[ar]": "Martin Klapetek",
"Name[az]": "Martin Klapetek",
"Name[ca]": "Martin Klapetek",
"Name[cs]": "Martin Klapetek",
"Name[en_GB]": "Martin Klapetek",
"Name[es]": "Martin Klapetek",
"Name[fr]": "Martin Klapetek",

@ -7,6 +7,7 @@
"Name[ar]": "فريق بلازما",
"Name[az]": "Plasma komandası",
"Name[ca]": "L'equip del Plasma",
"Name[cs]": "Team Plasma",
"Name[en_GB]": "The Plasma Team",
"Name[es]": "El equipo de Plasma",
"Name[fr]": "L'équipe de Plasma",

@ -7,6 +7,7 @@
"Name[ar]": "Aleix Pol Gonzalez",
"Name[az]": "Aleix Pol Gonzalez",
"Name[ca]": "Aleix Pol Gonzalez",
"Name[cs]": "Aleix Pol Gonzalez",
"Name[en_GB]": "Aleix Pol Gonzalez",
"Name[es]": "Aleix Pol Gonzalez",
"Name[fr]": "Aleix Pol Gonzalez",

@ -7,6 +7,7 @@
"Name[ar]": "Sebastian Kügler",
"Name[az]": "Sebastian Kügler",
"Name[ca]": "Sebastian Kügler",
"Name[cs]": "Sebastian Kügler",
"Name[en_GB]": "Sebastian Kügler",
"Name[es]": "Sebastian Kügler",
"Name[fr]": "Sebastian Kügler",

@ -7,6 +7,7 @@
"Name[ar]": "Kai Uwe Broulik",
"Name[az]": "Kai Uwe Broulik",
"Name[ca]": "Kai Uwe Broulik",
"Name[cs]": "Kai Uwe Broulik",
"Name[en_GB]": "Kai Uwe Broulik",
"Name[es]": "Kai Uwe Broulik",
"Name[fr]": "Kai Uwe Broulik",

@ -7,6 +7,7 @@
"Name[ar]": "فريق بلازما",
"Name[az]": "Plasma komandası",
"Name[ca]": "L'equip del Plasma",
"Name[cs]": "Team Plasma",
"Name[en_GB]": "The Plasma Team",
"Name[es]": "El equipo de Plasma",
"Name[fr]": "L'équipe de Plasma",

@ -7,6 +7,7 @@
"Name[ar]": "Kai Uwe Broulik",
"Name[az]": "Kai Uwe Broulik",
"Name[ca]": "Kai Uwe Broulik",
"Name[cs]": "Kai Uwe Broulik",
"Name[en_GB]": "Kai Uwe Broulik",
"Name[es]": "Kai Uwe Broulik",
"Name[fr]": "Kai Uwe Broulik",

@ -7,6 +7,7 @@
"Name[ar]": "Kai Uwe Broulik",
"Name[az]": "Kai Uwe Broulik",
"Name[ca]": "Kai Uwe Broulik",
"Name[cs]": "Kai Uwe Broulik",
"Name[en_GB]": "Kai Uwe Broulik",
"Name[es]": "Kai Uwe Broulik",
"Name[fr]": "Kai Uwe Broulik",

@ -7,6 +7,7 @@
"Name[ar]": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[cs]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[fr]": "Marco Martin",

@ -7,6 +7,7 @@
"Name[ar]": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[cs]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[fr]": "Marco Martin",

@ -7,6 +7,7 @@
"Name[ar]": "Kai Uwe Broulik",
"Name[az]": "Kai Uwe Broulik",
"Name[ca]": "Kai Uwe Broulik",
"Name[cs]": "Kai Uwe Broulik",
"Name[en_GB]": "Kai Uwe Broulik",
"Name[es]": "Kai Uwe Broulik",
"Name[fr]": "Kai Uwe Broulik",

@ -7,6 +7,7 @@
"Name[ar]": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[cs]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[fr]": "Marco Martin",

@ -7,6 +7,7 @@
"Name[ar]": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[cs]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[fr]": "Marco Martin",

@ -7,6 +7,7 @@
"Name[ar]": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[cs]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[fr]": "Marco Martin",

@ -7,6 +7,7 @@
"Name[ar]": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[cs]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[fr]": "Marco Martin",

@ -7,6 +7,7 @@
"Name[ar]": "Petri Damstén",
"Name[az]": "Petri Damstén",
"Name[ca]": "Petri Damstén",
"Name[cs]": "Petri Damstén",
"Name[en_GB]": "Petri Damstén",
"Name[es]": "Petri Damstén",
"Name[fr]": "Petri Damstén",

@ -7,6 +7,7 @@
"Name[ar]": "فريق بلازما",
"Name[az]": "Plasma komandası",
"Name[ca]": "L'equip del Plasma",
"Name[cs]": "Team Plasma",
"Name[en_GB]": "The Plasma Team",
"Name[es]": "El equipo de Plasma",
"Name[fr]": "L'équipe de Plasma",

@ -7,6 +7,7 @@
"Name[ar]": "Aaron Seigo",
"Name[az]": "Aaron Seigo",
"Name[ca]": "Aaron Seigo",
"Name[cs]": "Aaron Seigo",
"Name[en_GB]": "Aaron Seigo",
"Name[es]": "Aaron Seigo",
"Name[fr]": "Aaron Seigo",

@ -37,6 +37,7 @@
"Name[ar]": "إدارة الطاقة",
"Name[az]": "Enerjiyə nəzarət",
"Name[ca]": "Gestió d'energia",
"Name[cs]": "Správa napájení",
"Name[en_GB]": "Power Management",
"Name[es]": "Gestión de energía",
"Name[fr]": "Gestion de l'énergie",

@ -7,6 +7,7 @@
"Name[ar]": "فريق بلازما",
"Name[az]": "Plasma komandası",
"Name[ca]": "L'equip del Plasma",
"Name[cs]": "Team Plasma",
"Name[en_GB]": "The Plasma Team",
"Name[es]": "El equipo de Plasma",
"Name[fr]": "L'équipe de Plasma",

@ -7,6 +7,7 @@
"Name[ar]": "Aaron Seigo",
"Name[az]": "Aaron Seigo",
"Name[ca]": "Aaron Seigo",
"Name[cs]": "Aaron Seigo",
"Name[en_GB]": "Aaron Seigo",
"Name[es]": "Aaron Seigo",
"Name[fr]": "Aaron Seigo",

@ -7,6 +7,7 @@
"Name[ar]": "Kai Uwe Broulik",
"Name[az]": "Kai Uwe Broulik",
"Name[ca]": "Kai Uwe Broulik",
"Name[cs]": "Kai Uwe Broulik",
"Name[en_GB]": "Kai Uwe Broulik",
"Name[es]": "Kai Uwe Broulik",
"Name[fr]": "Kai Uwe Broulik",

@ -4,6 +4,7 @@
"Description[ar]": "يراقب تغييرات الأدلة",
"Description[az]": "Qovluqdakı dəyişiklikləri izləyir",
"Description[ca]": "Controla els canvis en els directoris",
"Description[cs]": "Monitoruje změny v adresáři",
"Description[en_GB]": "Monitors directories for changes",
"Description[es]": "Monitoriza cambios en directorios",
"Description[fr]": "Surveille les changements de dossiers",

@ -7,6 +7,7 @@
"Name[ar]": "Martin Klapetek",
"Name[az]": "Martin Klapetek",
"Name[ca]": "Martin Klapetek",
"Name[cs]": "Martin Klapetek",
"Name[en_GB]": "Martin Klapetek",
"Name[es]": "Martin Klapetek",
"Name[fr]": "Martin Klapetek",

@ -7,6 +7,7 @@
"Name[ar]": "Aleix Pol Gonzalez",
"Name[az]": "Aleix Pol Gonzalez",
"Name[ca]": "Aleix Pol Gonzalez",
"Name[cs]": "Aleix Pol Gonzalez",
"Name[en_GB]": "Aleix Pol Gonzalez",
"Name[es]": "Aleix Pol Gonzalez",
"Name[fr]": "Aleix Pol Gonzalez",

@ -59,6 +59,7 @@
"Name[ar]": "العلامات",
"Name[az]": "Əlfəcinlər",
"Name[ca]": "Adreces d'interès",
"Name[cs]": "Záložky",
"Name[en_GB]": "Bookmarks",
"Name[es]": "Marcadores",
"Name[fr]": "Signets",

@ -7,6 +7,7 @@
"Name[ar]": "فريق بلازما",
"Name[az]": "Plasma komandası",
"Name[ca]": "L'equip del Plasma",
"Name[cs]": "Team Plasma",
"Name[en_GB]": "Plasma Team",
"Name[es]": "Equipo de Plasma",
"Name[fr]": "Équipe de Plasma",

@ -7,6 +7,7 @@
"Name[ar]": "Alexander Lohnau",
"Name[az]": "Alexander Lohnau",
"Name[ca]": "Alexander Lohnau",
"Name[cs]": "Alexander Lohnau",
"Name[en_GB]": "Alexander Lohnau",
"Name[es]": "Alexander Lohnau",
"Name[fr]": "Alexander Lohnau",
@ -15,6 +16,7 @@
"Name[it]": "Alexander Lohnau",
"Name[nl]": "Alexander Lohnau",
"Name[pl]": "Alexander Lohnau",
"Name[pt_BR]": "Alexander Lohnau",
"Name[ru]": "Alexander Lohnau",
"Name[sl]": "Alexander Lohnau",
"Name[sv]": "Alexander Lohnau",
@ -34,6 +36,7 @@
"Description[it]": "Mostra le informazioni di aiuto sugli esecutori quando digiti «?» o «help»",
"Description[nl]": "Toont help-informatie over runners bij typen van \"?\" of \"help\"",
"Description[pl]": "Pokazuje pomoc o uruchamiaczach po wpisaniu \"?\" lub \"help\"",
"Description[pt_BR]": "Mostra informação de ajuda sobre os executores ao digitar \"?\" ou \"ajuda\"",
"Description[sl]": "Prikaži informacije za pomoč o zagonih kadar vtipkate \"?\" ali \"help\"",
"Description[sv]": "Visar hjälpinformation om körprogram när \"?\" eller \"hjälp\" skrivs in",
"Description[uk]": "Показує довідкові відомості щодо засобів запуску при введенні «?» або «help»",
@ -53,6 +56,7 @@
"Name[nl]": "Help van Runner",
"Name[pa]": "ਮਦਦ ਕਰਨਰ",
"Name[pl]": "Uruchamiacz pomocy",
"Name[pt_BR]": "Ajuda do executor",
"Name[sl]": "Pomoč za Runner",
"Name[sv]": "Hjälp om Kör program",
"Name[uk]": "Засіб надання довідки",

@ -7,6 +7,7 @@
"Name[ar]": "فريق بلازما",
"Name[az]": "Plasma komandası",
"Name[ca]": "L'equip del Plasma",
"Name[cs]": "Team Plasma",
"Name[en_GB]": "Plasma Team",
"Name[es]": "Equipo de Plasma",
"Name[fr]": "Équipe de Plasma",

@ -7,6 +7,7 @@
"Name[ar]": "David Edmundson",
"Name[az]": "David Edmundson",
"Name[ca]": "David Edmundson",
"Name[cs]": "David Edmundson",
"Name[en_GB]": "David Edmundson",
"Name[es]": "David Edmundson",
"Name[fr]": "David Edmundson",

@ -7,6 +7,7 @@
"Name[ar]": "Sebastian Kügler",
"Name[az]": "Sebastian Kügler",
"Name[ca]": "Sebastian Kügler",
"Name[cs]": "Sebastian Kügler",
"Name[en_GB]": "Sebastian Kügler",
"Name[es]": "Sebastian Kügler",
"Name[fr]": "Sebastian Kügler",

@ -7,6 +7,7 @@
"Name[ar]": "فريق بلازما",
"Name[az]": "Plasma komandası",
"Name[ca]": "L'equip del Plasma",
"Name[cs]": "Team Plasma",
"Name[en_GB]": "Plasma Team",
"Name[es]": "Equipo de Plasma",
"Name[fr]": "Équipe de Plasma",

@ -7,6 +7,7 @@
"Name[ar]": "فريق بلازما",
"Name[az]": "Plasma komandası",
"Name[ca]": "L'equip del Plasma",
"Name[cs]": "Team Plasma",
"Name[en_GB]": "Plasma Team",
"Name[es]": "Equipo de Plasma",
"Name[fr]": "Équipe de Plasma",

@ -7,6 +7,7 @@
"Name[ar]": "فريق بلازما",
"Name[az]": "Plasma komandası",
"Name[ca]": "L'equip del Plasma",
"Name[cs]": "Team Plasma",
"Name[en_GB]": "Plasma Team",
"Name[es]": "Equipo de Plasma",
"Name[fr]": "Équipe de Plasma",

@ -58,6 +58,7 @@
"Name[ar]": "كلمات بحث الويب",
"Name[az]": "İnternetdə axtarış üçün açar sözlər",
"Name[ca]": "Paraules clau de cerca a la web",
"Name[cs]": "Klíčová slova pro hledání na webu",
"Name[en_GB]": "Web Search Keywords",
"Name[es]": "Palabras clave de búsqueda web",
"Name[fr]": "Mots clé de recherche sur Internet",

@ -7,6 +7,7 @@
"Name[ar]": "فريق بلازما",
"Name[az]": "Plasma komandası",
"Name[ca]": "L'equip del Plasma",
"Name[cs]": "Team Plasma",
"Name[en_GB]": "Plasma Team",
"Name[es]": "Equipo de Plasma",
"Name[fr]": "Équipe de Plasma",

@ -8,6 +8,7 @@
"Name[ar]": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[cs]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[fr]": "Marco Martin",

@ -8,6 +8,7 @@
"Name[ar]": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[cs]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[fr]": "Marco Martin",

@ -8,6 +8,7 @@
"Name[ar]": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[cs]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[fr]": "Marco Martin",

@ -8,6 +8,7 @@
"Name[ar]": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[cs]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[fr]": "Marco Martin",

@ -8,6 +8,7 @@
"Name[ar]": "Aaron Seigo",
"Name[az]": "Aaron Seigo",
"Name[ca]": "Aaron Seigo",
"Name[cs]": "Aaron Seigo",
"Name[en_GB]": "Aaron Seigo",
"Name[es]": "Aaron Seigo",
"Name[fr]": "Aaron Seigo",

@ -7,6 +7,7 @@
"Name[ar]": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[cs]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[fr]": "Marco Martin",

@ -7,6 +7,7 @@
"Name[ar]": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[cs]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[fr]": "Marco Martin",

@ -7,6 +7,7 @@
"Name[ar]": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[cs]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[fr]": "Marco Martin",

Loading…
Cancel
Save