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"
This commit is contained in:
parent
ce0db1b461
commit
2bd517498d
3 changed files with 6 additions and 0 deletions
|
@ -1,5 +1,6 @@
|
|||
[KGameTheme]
|
||||
Name=Default
|
||||
Name[ar]=المبدئيّ
|
||||
Name[be]=Прадвызначаны
|
||||
Name[bg]=По подразбиране
|
||||
Name[br]=Dre ziouer
|
||||
|
@ -62,6 +63,7 @@ Name[x-test]=xxDefaultxx
|
|||
Name[zh_CN]=默认
|
||||
Name[zh_TW]=預設
|
||||
Description=Kigo Default theme for KDE 4
|
||||
Description[ar]=السمة المبدئية لكاي غو كدي٤
|
||||
Description[bg]=Подразбираща се тема Kigo за KDE 4
|
||||
Description[bs]=Kigo podrazumjevana tema za KDE 4
|
||||
Description[ca]=Tema predeterminat del Kigo per al KDE 4
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
[KGameTheme]
|
||||
Name=Plain
|
||||
Name[ar]=خالِص
|
||||
Name[bg]=Чиста
|
||||
Name[bs]=Obični
|
||||
Name[ca]=Normal
|
||||
|
@ -48,6 +49,7 @@ Name[x-test]=xxPlainxx
|
|||
Name[zh_CN]=纯色
|
||||
Name[zh_TW]=樸素
|
||||
Description=Plain Kigo theme based on Default theme by Arturo Silva
|
||||
Description[ar]=سمة كاي غو خالصة أساسها السمة المبدئية بواسطة Arturo Silva
|
||||
Description[bg]=Чиста тема Kigo на основата на подразбиращата се тема от Arturo Silva
|
||||
Description[bs]=Plain Kigo tema bazirana na Default temi Arturo Silva
|
||||
Description[ca]=Tema normal del Kigo basat en el tema predeterminat per n'Arturo Silva
|
||||
|
|
|
@ -9,6 +9,7 @@ MimeType=application/x-go-sgf;
|
|||
X-DBUS-ServiceName=org.kde.kigo
|
||||
|
||||
Name=Kigo
|
||||
Name[ar]=كاي غو
|
||||
Name[bg]=Kigo
|
||||
Name[bs]=Kigo
|
||||
Name[ca]=Kigo
|
||||
|
@ -60,6 +61,7 @@ Name[zh_CN]=Kigo
|
|||
Name[zh_TW]=Kigo
|
||||
|
||||
GenericName=Go Board Game
|
||||
GenericName[ar]=لعبة غو اللوحية
|
||||
GenericName[bg]=Настолна игра Go
|
||||
GenericName[bs]=Igraj igru na ploči
|
||||
GenericName[ca]=Joc de taula Go
|
||||
|
|
Loading…
Add table
Reference in a new issue