Commit 0bbb2e07 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 0d4d9889
......@@ -63,6 +63,7 @@ Name[tr]=KGoldrunner
Name[ug]=KGoldrunner
Name[uk]=Золотошукач
Name[wa]=KGoldrunner
Name[x-test]=xxKGoldrunnerxx
Name[zh_CN]=KGoldrunner
Name[zh_TW]=KGoldrunner 撿金塊
GenericName=Hunt Gold, Dodge Enemies and Solve Puzzles
......@@ -107,6 +108,7 @@ GenericName[sr@latin]=Sakupljajte zlato, izbegavajte neprijatelje i rešavajte z
GenericName[sv]=Leta guld, undvik fiender och lös problem
GenericName[tr]=Altın Avla, Düşmanlarını Atlat ve Bulmacaları Çöz
GenericName[uk]=Шукайте золото, уникайте ворогів і розгадуйте загадки
GenericName[x-test]=xxHunt Gold, Dodge Enemies and Solve Puzzlesxx
GenericName[zh_CN]=淘金,避敌,以及解谜
GenericName[zh_TW]=尋找金塊,躲避敵人,並解謎
Type=Application
......@@ -171,6 +173,7 @@ Comment[tg]=Бозии амалиёт ва ҳалли муаммоҳо
Comment[tr]=Aksiyon ve bulmaca çözümlerini barındıran bir oyun
Comment[ug]=ھەرىكەتلىك ۋە تېپىشماق تاپىدىغان ئويۇن
Comment[uk]=Вирішення головоломок на ходу
Comment[x-test]=xxA game of action and puzzle-solvingxx
Comment[zh_CN]=动作和解谜游戏
Comment[zh_TW]= 一個動作和解謎的遊戲
Terminal=false
......
......@@ -50,6 +50,7 @@ Name[tr]=Beyaz üzerine Siyah
Name[ug]=ئاقنىڭ ئۈستىدە قارا
Name[uk]=Чорне на білому
Name[wa]=Noer so blanc
Name[x-test]=xxBlack on Whitexx
Name[zh_CN]=白底黑字
Name[zh_TW]=黑與白
Description=A monochrome, black on white theme for KGoldrunner
......@@ -96,6 +97,7 @@ Description[sr@latin]=Jednobojna, crno‑bela tema K‑zlatobojca
Description[sv]=Ett enfärgat svartvitt tema för Kgoldrunner
Description[tr]=KGoldrunner için beyaz üzerine siyah, tek renkli bir tema
Description[uk]=Монохромна чорно-біла тема для Золотошукача
Description[x-test]=xxA monochrome, black on white theme for KGoldrunnerxx
Description[zh_CN]=KGoldrunner 黑白单色主题
Description[zh_TW]=KGoldrunner 黑白螢幕主題
Author=Luciano Montanaro
......
......@@ -50,6 +50,7 @@ Name[te]=కెగొల్ద్ రన్నర్ అప్రమెయం
Name[tr]=KGoldrunner Öntanımlı
Name[uk]=Типова тема Золотошукача
Name[wa]=KGoldRunner Prémetou
Name[x-test]=xxKGoldRunner Defaultxx
Name[zh_CN]=KGoldRunner 默认
Name[zh_TW]=KGoldRunner 預設
Description=A light and clean theme for KDE4
......@@ -99,6 +100,7 @@ Description[sr@latin]=Lagana i jasna tema za KDE4
Description[sv]=Ett lätt och rent tema för KDE4
Description[tr]=KDE 4 için aydınlık ve temiz bir tema
Description[uk]=Легка і чиста тема для KDE4
Description[x-test]=xxA light and clean theme for KDE4xx
Description[zh_CN]=KDE4 的轻爽主题
Description[zh_TW]=簡單又乾淨的 KDE 主題
Author=Mauricio Piacentini
......
......@@ -48,6 +48,7 @@ Name[sv]=Den egyptiska skatten
Name[tr]=Mısır'ın Hazineleri
Name[uk]=Скарби Єгипту
Name[wa]=Li trezôr d' Edjipe
Name[x-test]=xxThe Treasure of Egyptxx
Name[zh_CN]=埃及的宝藏
Name[zh_TW]=埃及的寶藏
Description=Help Matt Goldrunner escape the traps of ancient Egypt.
......@@ -93,6 +94,7 @@ Description[sr@latin]=Pomozite Mići zlatobojcu da izbegne klopke starog Egipta.
Description[sv]=Hjälp Matt Goldrunner undkomma fällorna i det forntida Egypten.
Description[tr]=Mert AltınPeşinde'ye eski Mısır'ın tuzaklarından kurtulmakta yardımcı olun.
Description[uk]=Допоможіть Метту Ґолдраннеру уникнути пасток давнього Єгипту.
Description[x-test]=xxHelp Matt Goldrunner escape the traps of ancient Egypt.xx
Description[zh_CN]=帮助淘金者 Matt 逃出古埃及的层层陷阱。
Description[zh_TW]=協助 Goldrunner 逃離古埃及
Author=Eugene Trounev
......
......@@ -46,6 +46,7 @@ Name[sr@latin]=Grad štrebera
Name[sv]=Nördstaden
Name[tr]=Geek Şehri
Name[uk]=Місто диваків
Name[x-test]=xxGeek Cityxx
Name[zh_CN]=极客之城
Name[zh_TW]=Geek City
Description=The hero is trapped inside a computer.
......@@ -96,6 +97,7 @@ Description[sr@latin]=Junak zarobljen u računaru.
Description[sv]=Hjälten är fångad i en dator
Description[tr]=Bir kahraman bilgisayarın içinde mahsur kaldı.
Description[uk]=Героя замкнено всередині комп’ютера.
Description[x-test]=xxThe hero is trapped inside a computer.xx
Description[zh_CN]=英雄被困在了电脑里。
Description[zh_TW]=英雄被困在電腦裡面。
Author=Eugene Trounev and Mauricio Piacentini
......
......@@ -45,6 +45,7 @@ Name[sr@latin]=Plava nostalgija
Name[sv]=Nostalgi-blues
Name[tr]=Nostalji Mavisi
Name[uk]=Напад ностальгії
Name[x-test]=xxNostalgia Bluesxx
Name[zh_CN]=怀旧蓝调
Name[zh_TW]=Nostalgia Blues
Description=A theme for KGoldrunner that brings back that 8-bit look... now in blue!
......@@ -92,6 +93,7 @@ Description[sr@latin]=Tema K‑zlatobojca koja vraća 8‑bitni izgled... sada u
Description[sv]=Ett tema för Kgoldrunner som återskapar 8-bitarsutseendet... Nu i blått.
Description[tr]=KGoldrunner'a 8-bit görünümünü geri getiren bir tema... Hem de şimdi mavi!
Description[uk]=Тема для Золотошукача, що повертає нас до 8-бітового вигляду... тепер синя!
Description[x-test]=xxA theme for KGoldrunner that brings back that 8-bit look... now in blue!xx
Description[zh_CN]=KGoldrunner 的主题, 带来经典的8-bit的外观... 现在是蓝色的!
Description[zh_TW]=KGoldrunner 的佈景主題,就像是八位元時代的畫面。
Author=Luciano Montanaro
......
......@@ -49,6 +49,7 @@ Name[sv]=Nostalgi
Name[tr]=Nostalji
Name[uk]=Ностальгія
Name[wa]=Nostaldjeye
Name[x-test]=xxNostalgiaxx
Name[zh_CN]=怀旧
Name[zh_TW]=Nostalgia
Description=A scalable theme for KGoldrunner that brings back that 8-bit look...
......@@ -96,6 +97,7 @@ Description[sr@latin]=Tema K‑zlatobojca koja vraća 8‑bitni izgled...
Description[sv]=Ett skalbart tema för Kgoldrunner som återskapar 8-bitarsutseendet...
Description[tr]=KGoldrunner'a 8-bit görünümünü geri getiren ölçeklenebilir bir tema...
Description[uk]=Тема з можливістю зміни масштабу для Золотошукача, яка повертає нас до 8-бітового вигляду...
Description[x-test]=xxA scalable theme for KGoldrunner that brings back that 8-bit look...xx
Description[zh_CN]=将您引回 8-bit 感官时代的可缩放 KGoldrunner 主题...
Description[zh_TW]=KGoldrunner 可調整的主題,就像是八位元時代的畫面。
Author=Luciano Montanaro
......
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