Commit f6b79afc 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 9f15fcfa
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
"Name[ca]": "Amplia el text", "Name[ca]": "Amplia el text",
"Name[de]": "Text vergrößern", "Name[de]": "Text vergrößern",
"Name[es]": "Ampliar texto", "Name[es]": "Ampliar texto",
"Name[it]": "Ingrandisci testo",
"Name[nl]": "Tekst zoomen", "Name[nl]": "Tekst zoomen",
"Name[pl]": "Powiększ tekst", "Name[pl]": "Powiększ tekst",
"Name[pt]": "Ampliar o Texto", "Name[pt]": "Ampliar o Texto",
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
], ],
"Version": "1.0" "Version": "1.0"
} }
} }
\ No newline at end of file
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