Commit 2f6979e6 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 0f6db220
...@@ -55,8 +55,8 @@ Name[zh_CN]=白底黑字 ...@@ -55,8 +55,8 @@ Name[zh_CN]=白底黑字
Name[zh_TW]=黑與白 Name[zh_TW]=黑與白
Description=A monochrome, black on white theme for KGoldrunner Description=A monochrome, black on white theme for KGoldrunner
Description[bs]=Monohromatka, crno na bijelom tema za KTragač zlata Description[bs]=Monohromatka, crno na bijelom tema za KTragač zlata
Description[ca]=Un tema monocrom (negra sobre blanc) per KGoldrunner Description[ca]=Un tema monocrom (negra sobre blanc) per al KGoldrunner
Description[ca@valencia]=Un tema monocrom (negra sobre blanc) per KGoldrunner Description[ca@valencia]=Un tema monocrom (negra sobre blanc) per al KGoldrunner
Description[da]=Et monokromt, sort på hvid-tema til KGoldrunner Description[da]=Et monokromt, sort på hvid-tema til KGoldrunner
Description[de]=Ein monochromes Schwarz-Weiß-Design für KGoldrunner. Description[de]=Ein monochromes Schwarz-Weiß-Design für KGoldrunner.
Description[el]=Ένα μονόχρωμο, μαύρο σε λευκό θέμα για το KGoldrunner Description[el]=Ένα μονόχρωμο, μαύρο σε λευκό θέμα για το KGoldrunner
......
[KGameTheme] [KGameTheme]
Name=KGoldRunner Default Name=KGoldRunner Default
Name[bs]=KGoldRunner podrazumijevano Name[bs]=KGoldRunner podrazumijevano
Name[ca]=Predeterminat de KGoldRunner Name[ca]=Predeterminat del KGoldRunner
Name[ca@valencia]=Predeterminat de KGoldRunner Name[ca@valencia]=Predeterminat del KGoldRunner
Name[cs]=Výchozí pro KGoldrunner Name[cs]=Výchozí pro KGoldrunner
Name[da]=Standard for KGoldrunner Name[da]=Standard for KGoldrunner
Name[de]=Standard Name[de]=Standard
......
...@@ -50,8 +50,8 @@ Name[zh_CN]=怀旧蓝调 ...@@ -50,8 +50,8 @@ Name[zh_CN]=怀旧蓝调
Name[zh_TW]=Nostalgia Blues Name[zh_TW]=Nostalgia Blues
Description=A theme for KGoldrunner that brings back that 8-bit look... now in blue! Description=A theme for KGoldrunner that brings back that 8-bit look... now in blue!
Description[bs]=Tema za KTragač zlata koja vraća 8-bitni izgled... sada u plavoj boji! Description[bs]=Tema za KTragač zlata koja vraća 8-bitni izgled... sada u plavoj boji!
Description[ca]=Un tema per KGoldrunner que us porta l'aspecte clàssic dels 8-bits... ara en blau! Description[ca]=Un tema per al KGoldrunner que us porta l'aspecte clàssic dels 8-bits... ara en blau!
Description[ca@valencia]=Un tema per KGoldrunner que vos porta l'aspecte clàssic dels 8-bits... ara en blau! Description[ca@valencia]=Un tema per al KGoldrunner que vos porta l'aspecte clàssic dels 8-bits... ara en blau!
Description[da]=Et tema til KGoldrunner som bringer 8-bit-udseendet tilbage... nu i blåt! Description[da]=Et tema til KGoldrunner som bringer 8-bit-udseendet tilbage... nu i blåt!
Description[de]=Ein Design für KGoldrunner mit dem alten 8-Bit-Charme ... Jetzt in Blau! Description[de]=Ein Design für KGoldrunner mit dem alten 8-Bit-Charme ... Jetzt in Blau!
Description[el]=Ένα θέμα για το KGoldrunner το οποίο μας επιστρέφει στην όψη των 8-bit... τώρα σε μπλε! Description[el]=Ένα θέμα για το KGoldrunner το οποίο μας επιστρέφει στην όψη των 8-bit... τώρα σε μπλε!
......
...@@ -54,8 +54,8 @@ Name[zh_CN]=怀旧 ...@@ -54,8 +54,8 @@ Name[zh_CN]=怀旧
Name[zh_TW]=Nostalgia Name[zh_TW]=Nostalgia
Description=A scalable theme for KGoldrunner that brings back that 8-bit look... Description=A scalable theme for KGoldrunner that brings back that 8-bit look...
Description[bs]=Skalabilna tema za KTragač zlata koja vraća 8-bitni izgled... Description[bs]=Skalabilna tema za KTragač zlata koja vraća 8-bitni izgled...
Description[ca]=Un tema per KGoldrunner que us porta l'aspecte clàssic dels 8-bits... Description[ca]=Un tema per al KGoldrunner que us porta l'aspecte clàssic dels 8-bits...
Description[ca@valencia]=Un tema per KGoldrunner que vos porta l'aspecte clàssic dels 8-bits... Description[ca@valencia]=Un tema per al KGoldrunner que vos porta l'aspecte clàssic dels 8-bits...
Description[da]=Et skalerbart tema til KGoldrunner som bruger 8-bit-udseendet tilbage... Description[da]=Et skalerbart tema til KGoldrunner som bruger 8-bit-udseendet tilbage...
Description[de]=Ein vergrößerbares Design mit dem alten 8-Bit-Charme ... Description[de]=Ein vergrößerbares Design mit dem alten 8-Bit-Charme ...
Description[el]=Ένα διανυσματικό για το KGoldrunner το οποίο μας επιστρέφει στην όψη των 8-bit... Description[el]=Ένα διανυσματικό για το KGoldrunner το οποίο μας επιστρέφει στην όψη των 8-bit...
......
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