Commit 8e20d4d9 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 64535f16
......@@ -20,6 +20,7 @@ Name[zh_CN]=QObject pimpl 子类
Comment=QObject subclass with private implementation
Comment[ca]=Una subclasse QObject amb implementació privada
Comment[ca@valencia]=Una subclasse QObject amb implementació privada
Comment[de]=QObject-Unterklasse mit privater Implementierung
Comment[en_GB]=QObject subclass with private implementation
Comment[es]=Una subclase de QObject con una implementación privada
Comment[fr]=Une sous-classe QObject avec une implémentation privée
......
......@@ -3,6 +3,7 @@ Name=QObject interface class
Name[ca]=Classe d'interfície QObject
Name[ca@valencia]=Classe d'interfície QObject
Name[cs]=Třída QObject interface
Name[de]=QObject-Schnittstellenklasse
Name[en_GB]=QObject interface class
Name[es]=Clase de interfaz para QObject
Name[fr]=Classe d'interface QObject
......@@ -20,6 +21,7 @@ Name[zh_CN]=QObject 接口类
Comment=QObject interface class with properties
Comment[ca]=Classe d'interfície QObject amb propietats
Comment[ca@valencia]=Classe d'interfície QObject amb propietats
Comment[de]=QObject-Schnittstellenklasse mit Eigenschaften
Comment[en_GB]=QObject interface class with properties
Comment[es]=Clase de interfaz para QObject con propiedades
Comment[fr]=Interface QObject avec des propriétés
......
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