Commit 82f78066 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 cbc7d9c7
......@@ -32,6 +32,7 @@ Name[zh_CN]=Oxygen 黑
Name[zh_TW]=Oxygen 黑
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[ca]=Tema de ratolí Oxygen. Oxygenitza el teu escriptori!
Comment[de]=Mausdesign für Oxygen.
Comment[en_GB]=Oxygen mouse theme. Oxygenise your desktop!
Comment[es]=Tema de ratón Oxígeno. ¡Oxigene su escritorio!
Comment[fi]=Oxygen-osoitinteema. Oxygenisoi työpöytäsi!
......
......@@ -32,6 +32,7 @@ Name[zh_CN]=Oxygen 蓝
Name[zh_TW]=Oxygen 藍
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[ca]=Tema de ratolí Oxygen. Oxygenitza el teu escriptori!
Comment[de]=Mausdesign für Oxygen.
Comment[en_GB]=Oxygen mouse theme. Oxygenise your desktop!
Comment[es]=Tema de ratón Oxígeno. ¡Oxigene su escritorio!
Comment[fi]=Oxygen-osoitinteema. Oxygenisoi työpöytäsi!
......
......@@ -33,6 +33,7 @@ Name[zh_CN]=Oxygen 白
Name[zh_TW]=Oxygen 白
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[ca]=Tema de ratolí Oxygen. Oxygenitza el teu escriptori!
Comment[de]=Mausdesign für Oxygen.
Comment[en_GB]=Oxygen mouse theme. Oxygenise your desktop!
Comment[es]=Tema de ratón Oxígeno. ¡Oxigene su escritorio!
Comment[fi]=Oxygen-osoitinteema. Oxygenisoi työpöytäsi!
......
......@@ -32,6 +32,7 @@ Name[zh_CN]=Oxygen 黄
Name[zh_TW]=Oxygen 黃
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[ca]=Tema de ratolí Oxygen. Oxygenitza el teu escriptori!
Comment[de]=Mausdesign für Oxygen.
Comment[en_GB]=Oxygen mouse theme. Oxygenise your desktop!
Comment[es]=Tema de ratón Oxígeno. ¡Oxigene su escritorio!
Comment[fi]=Oxygen-osoitinteema. Oxygenisoi työpöytäsi!
......
[Icon Theme]
Name=Oxygen Zion
Name[ca]=Oxygen Zion
Name[de]=Oxygen-Zion
Name[en_GB]=Oxygen Zion
Name[es]=Oxígeno Sión
Name[fi]=Oxygen Zion
......@@ -28,6 +29,7 @@ Name[zh_CN]=Oxygen Zion
Name[zh_TW]=Oxygen Zion
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[ca]=Tema de ratolí Oxygen. Oxygenitza el teu escriptori!
Comment[de]=Mausdesign für Oxygen.
Comment[en_GB]=Oxygen mouse theme. Oxygenise your desktop!
Comment[es]=Tema de ratón Oxígeno. ¡Oxigene su escritorio!
Comment[fi]=Oxygen-osoitinteema. Oxygenisoi työpöytäsi!
......
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