Commit c96e7992 authored by Script Kiddy's avatar Script Kiddy

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"
parent 6072c9a9
......@@ -3,6 +3,7 @@ Name=KMuddy
......@@ -29,6 +30,7 @@ DocPath=kmuddy/index.html
GenericName=MUD client
GenericName[bs]=MUD klijent
GenericName[ca]=Client de MUD
GenericName[ca@valencia]=Client de MUD
GenericName[es]=Cliente de MUD
GenericName[et]=MUD-i klient
......@@ -49,6 +51,7 @@ GenericName[x-test]=xxMUD clientxx
Comment=MUD client
Comment[bs]=MUD klijent
Comment[ca]=Client de MUD
Comment[ca@valencia]=Client de MUD
Comment[es]=Cliente de MUD
Comment[et]=MUD-i klient
......@@ -6,6 +6,7 @@ X-KDE-Derived=KPluginInfo
Comment=KMuddy Plugin
Comment[bs]=KMuddy Servis
Comment[ca]=Connector del KMuddy
Comment[ca@valencia]=Connector del KMuddy
Comment[es]=Complemento para KMuddy
Comment[et]=KMuddy plugin
......@@ -3,6 +3,7 @@ Encoding=UTF-8
Name=Profile Converter
Name[bs]=Profil Pretvarač
Name[ca]=Convertidor de perfils
Name[ca@valencia]=Convertidor de perfils
Name[es]=Conversor de perfiles
......@@ -23,6 +24,7 @@ Name[x-test]=xxProfile Converterxx
Comment=This plug-in converts profiles from old KMuddy versions.
Comment[bs]=Ovaj servis pretvara profile iz starih KMuddy verzija.
Comment[ca]=Aquest connector converteix els perfils des de versions antigues del KMuddy.
Comment[ca@valencia]=Aquest connector converteix els perfils des de versions antigues del KMuddy.
Comment[de]=Dieses Modul wandelt Profile älterer KMuddy-Versionen um.
Comment[es]=Este complemento convierte perfiles desde versiones antiguas de KMuddy.
Comment[et]=Plugin, mis teisendab profiile KMuddy vanematest versioonidest.
......@@ -3,6 +3,7 @@ Type=Service
Comment=A Mapper for KMuddy
Comment[bs]=Mapper za KMuddy
Comment[ca]=Un mapador pel KMuddy
Comment[ca@valencia]=Un mapador pel KMuddy
Comment[de]=Ein Mapper für KMuddy
Comment[es]=Mapeador para KMuddy
Comment[et]=KMuddy tasemelooja
......@@ -21,6 +22,7 @@ Comment[x-test]=xxA Mapper for KMuddyxx
Name=Kmuddy Mapper
Name[bs]=Kmuddy Mapper
Name[ca]=Mapador del KMuddy
Name[ca@valencia]=Mapador del KMuddy
Name[es]=Mapeador para Kmuddy
Name[et]=KMuddy tasemelooja
......@@ -4,6 +4,7 @@ X-KDE-ServiceType=KMuddy/Mapper/Plugin
Name=KMuddy Mapper Tool
Name[bs]=Alat za KMuddy Mapper
Name[ca]=Eina de mapatge del KMuddy
Name[ca@valencia]=Eina de mapatge del KMuddy
Name[es]=Herramienta mapeadora para KMuddy
Name[et]=KMuddy tasemelooja
......@@ -3,6 +3,7 @@ Encoding=UTF-8
Name=External Scripting
Name[bs]=Vanjsko skriptiranje
Name[ca]=Creació de scripts externs
Name[ca@valencia]=Creació de scripts externs
Name[de]=Externe Skripte
Name[es]=Scripts externos
Name[et]=Väline skriptimine
......@@ -23,6 +24,7 @@ Name[x-test]=xxExternal Scriptingxx
Comment=Adds support for external scripting.
Comment[bs]=Daje podršku za vanjsko skriptiranje.
Comment[ca]=Afegeix suport per a la creació de scripts externs.
Comment[ca@valencia]=Afig suport per a la creació de scripts externs.
Comment[de]=Unterstützung für externe Skripte
Comment[es]=Añade apoyo para scripts externos.
Comment[et]=Välise skriptimise toetus.
......@@ -3,6 +3,7 @@ Encoding=UTF-8
......@@ -27,6 +28,7 @@ Name[zh_CN]=字符串
Comment=This plug-in adds many strings functions.
Comment[bs]=Ovaj servis daje mnoge stringovne funkcije.
Comment[ca]=Aquest connector afegeix moltes funcions de cadenes.
Comment[ca@valencia]=Aquest connector afig moltes funcions de cadenes.
Comment[de]=Ein Modul für viele Zeichenketten-Funktionen.
Comment[es]=Este complemento añade muchas funciones de cadena.
Comment[et]=Paljusid stringifunktsioone lisav plugin.
......@@ -3,6 +3,7 @@ Encoding=UTF-8
Name=Variable Triggers
Name[bs]=Promjenjivi okidači
Name[ca]=Actibadors variables
Name[ca@valencia]=Actibadors variables
Name[de]=Variable löst aus
Name[es]=Desencadenantes variables
......@@ -22,6 +23,7 @@ Name[x-test]=xxVariable Triggersxx
Comment=Adds supports for triggers that fire off variable changes.
Comment[bs]=Daje podršku za prekidače koji aktiviraju na promjene varijabli.
Comment[ca]=Afegeix suport per activadors que desencadenen canvis variables.
Comment[ca@valencia]=Afig suport per activadors que desencadenen canvis variables.
Comment[de]=Fügt Unterstützung für Auslöser hinzu, die Änderungen von Variablen bewirken.
Comment[es]=Añade apoyo para desencadenantes que disparan cambios variables.
Comment[et]=Muutujate muutumise puhul käivituvate päästikute toetus.
......@@ -3,6 +3,7 @@ Encoding=UTF-8
Name=Variable Viewer
Name[bs]=Preglednik Varijabli
Name[ca]=Visor variable
Name[ca@valencia]=Visor variable
Name[es]=Visor variable
......@@ -23,6 +24,7 @@ Name[x-test]=xxVariable Viewerxx
Comment=This plug-in provides a variable viewer window.
Comment[bs]=Ovaj servis pruža prozor za pregled varijable.
Comment[ca]=Aquest connector proporciona una finestra per a la visualització variable.
Comment[ca@valencia]=Aquest connector proporciona una finestra per a la visualització variable.
Comment[de]=Diese Modul stellt ein Ansichtsfenster für Variablen bereit.
Comment[es]=Este complemento proporciona una ventana de visor variable.
Comment[et]=Muutujanäitaja akent pakkuv plugin.
......@@ -3,6 +3,7 @@ Encoding=UTF-8
Name=Plugin Template
Name[bs]=Servisni Predložak
Name[ca]=Plantilla de connector
Name[ca@valencia]=Plantilla de connector
Name[es]=Plantilla para complementos
......@@ -24,6 +25,7 @@ Name[x-test]=xxPlugin Templatexx
Comment=Plugin Template
Comment[bs]=Servisni Predložak
Comment[ca]=Plantilla de connector
Comment[ca@valencia]=Plantilla de connector
Comment[es]=Plantilla para complementos
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment