Commit 7bfdcedb 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 6705a8b2
......@@ -34,8 +34,8 @@ Name[zh_TW]=地理_KDE Marble
GenericName=Virtual Globe
GenericName[bg]=Настолен глобус
GenericName[bs]=Virtualni globus
GenericName[ca]=Globus virtual
GenericName[ca@valencia]=Globus virtual
GenericName[ca]=Globus terraqüi virtual
GenericName[ca@valencia]=Globus terraqüi virtual
GenericName[cs]=Virtuální globus
GenericName[da]=Virtuel globus
GenericName[de]=Virtueller Globus
......
......@@ -60,8 +60,8 @@ Name[zh_TW]=地理_Marble
GenericName=Virtual Globe
GenericName[bg]=Настолен глобус
GenericName[bs]=Virtualni globus
GenericName[ca]=Globus virtual
GenericName[ca@valencia]=Globus virtual
GenericName[ca]=Globus terraqüi virtual
GenericName[ca@valencia]=Globus terraqüi virtual
GenericName[cs]=Virtuální globus
GenericName[da]=Virtuel globus
GenericName[de]=Virtueller Globus
......
......@@ -61,8 +61,8 @@ NoDisplay=true
GenericName=Virtual Globe
GenericName[bg]=Настолен глобус
GenericName[bs]=Virtualni globus
GenericName[ca]=Globus virtual
GenericName[ca@valencia]=Globus virtual
GenericName[ca]=Globus terraqüi virtual
GenericName[ca@valencia]=Globus terraqüi virtual
GenericName[cs]=Virtuální globus
GenericName[da]=Virtuel globus
GenericName[de]=Virtueller Globus
......
......@@ -60,8 +60,8 @@ Name[zh_TW]=地理_Marble
GenericName=Virtual Globe
GenericName[bg]=Настолен глобус
GenericName[bs]=Virtualni globus
GenericName[ca]=Globus virtual
GenericName[ca@valencia]=Globus virtual
GenericName[ca]=Globus terraqüi virtual
GenericName[ca@valencia]=Globus terraqüi virtual
GenericName[cs]=Virtuální globus
GenericName[da]=Virtuel globus
GenericName[de]=Virtueller Globus
......
......@@ -61,8 +61,8 @@ NoDisplay=true
GenericName=Virtual Globe
GenericName[bg]=Настолен глобус
GenericName[bs]=Virtualni globus
GenericName[ca]=Globus virtual
GenericName[ca@valencia]=Globus virtual
GenericName[ca]=Globus terraqüi virtual
GenericName[ca@valencia]=Globus terraqüi virtual
GenericName[cs]=Virtuální globus
GenericName[da]=Virtuel globus
GenericName[de]=Virtueller Globus
......
......@@ -61,8 +61,8 @@ NoDisplay=true
GenericName=Virtual Globe
GenericName[bg]=Настолен глобус
GenericName[bs]=Virtualni globus
GenericName[ca]=Globus virtual
GenericName[ca@valencia]=Globus virtual
GenericName[ca]=Globus terraqüi virtual
GenericName[ca@valencia]=Globus terraqüi virtual
GenericName[cs]=Virtuální globus
GenericName[da]=Virtuel globus
GenericName[de]=Virtueller Globus
......
......@@ -61,8 +61,8 @@ NoDisplay=true
GenericName=Virtual Globe
GenericName[bg]=Настолен глобус
GenericName[bs]=Virtualni globus
GenericName[ca]=Globus virtual
GenericName[ca@valencia]=Globus virtual
GenericName[ca]=Globus terraqüi virtual
GenericName[ca@valencia]=Globus terraqüi virtual
GenericName[cs]=Virtuální globus
GenericName[da]=Virtuel globus
GenericName[de]=Virtueller Globus
......
......@@ -61,8 +61,8 @@ NoDisplay=true
GenericName=Virtual Globe
GenericName[bg]=Настолен глобус
GenericName[bs]=Virtualni globus
GenericName[ca]=Globus virtual
GenericName[ca@valencia]=Globus virtual
GenericName[ca]=Globus terraqüi virtual
GenericName[ca@valencia]=Globus terraqüi virtual
GenericName[cs]=Virtuální globus
GenericName[da]=Virtuel globus
GenericName[de]=Virtueller Globus
......
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