Commit d13728bb 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 10502a31
......@@ -3,7 +3,7 @@ Type=Service
Exec=blubb
Comment=Finds and runs PHPUnit tests.
Comment[ca]=Cerca i executa les proves de PHPUnit.
Comment[ca@valencia]=Cerca i executa proves del PHPUnit.
Comment[ca@valencia]=Cerca i executa les proves de PHPUnit.
Comment[cs]=Hledá a spouští testy PHPUnit.
Comment[da]=Finder og kører PHPUnit-test.
Comment[de]=Sucht und führt PHPUnit-Tests aus.
......
......@@ -3,7 +3,7 @@ Type=Service
Exec=blubb
Comment=Finds and runs PHPUnit tests.
Comment[ca]=Cerca i executa les proves de PHPUnit.
Comment[ca@valencia]=Cerca i executa proves del PHPUnit.
Comment[ca@valencia]=Cerca i executa les proves de PHPUnit.
Comment[cs]=Hledá a spouští testy PHPUnit.
Comment[da]=Finder og kører PHPUnit-test.
Comment[de]=Sucht und führt PHPUnit-Tests aus.
......
......@@ -33,7 +33,7 @@
],
"Category": "Testing",
"Description": "Finds and runs PHPUnit tests.",
"Description[ca@valencia]": "Cerca i executa proves del PHPUnit.",
"Description[ca@valencia]": "Cerca i executa les proves de PHPUnit.",
"Description[ca]": "Cerca i executa les proves de PHPUnit.",
"Description[cs]": "Hledá a spouští testy PHPUnit.",
"Description[da]": "Finder og kører PHPUnit-test.",
......
......@@ -42,6 +42,7 @@ Name[zh_CN]=水平布局
Name[zh_TW]=水平佈局
Comment=Layout which renders horizontal
Comment[ca]=Disposició que renderitza horitzontalment
Comment[ca@valencia]=Disposició que renderitza horitzontalment
Comment[de]=Layout, das horizontal gerendert wird
Comment[en_GB]=Layout which renders horizontal
Comment[es]=Diseño que se organiza de forma horizontal
......
......@@ -42,6 +42,7 @@ Name[zh_CN]=水平布局
Name[zh_TW]=水平佈局
Comment=Layout which renders horizontal
Comment[ca]=Disposició que renderitza horitzontalment
Comment[ca@valencia]=Disposició que renderitza horitzontalment
Comment[de]=Layout, das horizontal gerendert wird
Comment[en_GB]=Layout which renders horizontal
Comment[es]=Diseño que se organiza de forma horizontal
......
......@@ -42,6 +42,7 @@ Name[zh_CN]=水平布局
Name[zh_TW]=水平佈局
Comment=Layout which renders horizontal
Comment[ca]=Disposició que renderitza horitzontalment
Comment[ca@valencia]=Disposició que renderitza horitzontalment
Comment[de]=Layout, das horizontal gerendert wird
Comment[en_GB]=Layout which renders horizontal
Comment[es]=Diseño que se organiza de forma horizontal
......
......@@ -42,6 +42,7 @@ Name[zh_CN]=水平布局
Name[zh_TW]=水平佈局
Comment=Layout which renders horizontal
Comment[ca]=Disposició que renderitza horitzontalment
Comment[ca@valencia]=Disposició que renderitza horitzontalment
Comment[de]=Layout, das horizontal gerendert wird
Comment[en_GB]=Layout which renders horizontal
Comment[es]=Diseño que se organiza de forma horizontal
......
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